diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-02-09 02:35:58 +0200 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-02-09 02:57:02 +0200 |
| commit | 70708488d670129ef86c84088bd480377dccbac2 (patch) | |
| tree | e3f3448cb8650039564d737561f2f3ab534a0637 | |
| parent | aaf2df093603cc9e6ce16f5651d2e5e0b5c8dcb4 (diff) | |
index.html: cleanup top-bar, temporary hide of profile circle
| -rw-r--r-- | res/client/css/partials/top-bar.scss | 20 | ||||
| -rw-r--r-- | res/templates/index.html | 6 |
2 files changed, 9 insertions, 17 deletions
diff --git a/res/client/css/partials/top-bar.scss b/res/client/css/partials/top-bar.scss index 69480d95..6f98c259 100644 --- a/res/client/css/partials/top-bar.scss +++ b/res/client/css/partials/top-bar.scss @@ -1,15 +1,14 @@ .top-bar{ - position:relative; - top:0; - left:0; - width:100%; - min-height:$three-baselines; - background-color:$dark-grey; + padding-top: 10px; + padding-bottom: 10px; + min-height: $three-baselines; + background-color: $dark-grey; } .user-area { + display: inline; float: right; - margin: 3px $doc-margin 3px $doc-margin; + margin-right: 40px; } .username { @@ -22,7 +21,7 @@ width: 30px; height: 30px; background: $cyan; - display: inline-block; + display: none; } .profile-initials { @@ -35,12 +34,7 @@ } .profile-username { - display: inline-block; - top:12px; color: $light-grey; - position: relative; - left: -20px; - top: -10px; } #doc-title{ diff --git a/res/templates/index.html b/res/templates/index.html index 866d0572..5fc64cc7 100644 --- a/res/templates/index.html +++ b/res/templates/index.html @@ -12,10 +12,8 @@ <div class="top-bar"> <span id="doc-title">Rhizi Prototype</span> <div class="user-area"> - <div class="username"> - <div class="profile-circle"></div> - <div class="profile-username">Welcome <span id="user_id">{{ rz_username }}</span>!<span id="btn-logout" class="button">Logout</span></div> - </div> + <span id="profile-circle"></span> + <span class="profile-username">Welcome <span id="user_id">{{ rz_username }}</span>!<span id="btn-logout" class="button">Logout</span></span> </div> </div> <div id="intro-task" class="task-alert" style="display:none"> |