From 3d0249c8bc2d5f12f8528dd0fcb7d02c66bee626 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 18 Dec 2015 19:47:33 +0500 Subject: Multiple UI Improvements --- web/sass-files/sass/partials/_settings.scss | 244 +++++++++++++++------------- 1 file changed, 133 insertions(+), 111 deletions(-) (limited to 'web/sass-files/sass/partials/_settings.scss') diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index 473ffb28d..bd47ca960 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -82,9 +82,8 @@ .nav { position: fixed; width: 179px; - &.absolute { - position: absolute; - top: 0; + &.position--top { + top: 57px; } } .security-links { @@ -141,144 +140,167 @@ width: 29px; } } - .premade-themes { - margin-bottom: 10px; - .theme-label { - font-weight: 400; - margin-top: 5px; - } - img { - border: 3px solid transparent; + .group--code { + select { + padding-right: 25px; } - .active { - img { - border-color: $primary-color; - } + &:before { + position: absolute; + top: 11px; + right: 50px; + z-index: 5; + content: "\f0d7"; + display: inline-block; + font: normal normal normal 14px/1 FontAwesome; + font-size: inherit; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } + select { + -moz-appearance:none; + -webkit-appearance:none; + appearance:none; + } + } + .premade-themes { + margin-bottom: 10px; + .theme-label { + font-weight: 400; + margin-top: 5px; } - .custom-label { - font-weight: normal; - font-size: 13px; - width: 100%; - overflow: hidden; - text-overflow: ellipsis; - margin-bottom: 0; - } - .input-group-addon { - background: transparent; + img { + border: 3px solid transparent; } - .radio { - label { - font-weight: 600; + .active { + img { + border-color: $primary-color; } } } - - .section-title { - margin-bottom: 5px; - font-weight: 600; + .custom-label { + font-weight: normal; + font-size: 13px; + width: 100%; + overflow: hidden; + text-overflow: ellipsis; + margin-bottom: 0; } - - .section-edit { - text-align: right; - margin-bottom: 5px; - .fa { - margin-right: 5px; - font-size: 12px; - @include opacity(0.5); - display: none; + .input-group-addon { + background: transparent; + } + .radio { + label { + font-weight: 600; } } + } - .section-describe { - @include opacity(0.7); - white-space:pre; - } + .section-title { + margin-bottom: 5px; + font-weight: 600; + } - .divider-dark { - border-bottom:1px solid #aaaaaa; + .section-edit { + text-align: right; + margin-bottom: 5px; + .fa { + margin-right: 5px; + font-size: 12px; + @include opacity(0.5); + display: none; } + } - .divider-light { - border-bottom:1px solid lightgrey; - } + .section-describe { + @include opacity(0.7); + white-space:pre; + } - .setting-list { - padding: 0; - list-style-type:none; - } + .divider-dark { + border-bottom:1px solid #aaaaaa; + } - .setting-list__hint { - margin-top: 20px; - } + .divider-light { + border-bottom:1px solid lightgrey; + } - .mentions-input { - margin-top: 10px; - } + .setting-list { + padding: 0; + list-style-type:none; + } - .setting-list-item { - margin-top:7px; - } - .has-error { - color: #a94442; - } + .setting-list__hint { + margin-top: 20px; + } - .file-status { - font-size: 13px; - margin-top: 8px; - color: #555; - } + .mentions-input { + margin-top: 10px; + } - .confirm-import { - padding: 4px 10px; - margin: 10px 0; - } + .setting-list-item { + margin-top:7px; + } + .has-error { + color: #a94442; + } + .file-status { + font-size: 13px; + margin-top: 8px; + color: #555; } + + .confirm-import { + padding: 4px 10px; + margin: 10px 0; + } + } - .nav-pills { - > li { - margin: 0; +} +.nav-pills { + > li { + margin: 0; + a { + border-radius: 0; + color: #777; + } + .glyphicon { + width: 25px; + top: 2px; + } + &:hover { a { - border-radius: 0; - color: #777; + background: #E6F2FA; } - .glyphicon { - width: 25px; - top: 2px; - } - &:hover { - a { - background: #E6F2FA; + } + &.active { + a { + color: #111; + background-color: #E1E1E1; + &:before { + content: ''; + position: absolute; + top: 0; + left: 0; + width: 5px; + height: 100%; + background: #000; } } - &.active { - a { - color: #111; - background-color: #E1E1E1; - &:before { - content: ''; - position: absolute; - top: 0; - left: 0; - width: 5px; - height: 100%; - background: #000; - } - } - a, a:hover, a:focus { - padding-right: 10px; - background-color: rgba(black, 0.1); - border-radius: 0; - font-weight: 400; - position: relative; - } + a, a:hover, a:focus { + padding-right: 10px; + background-color: rgba(black, 0.1); + border-radius: 0; + font-weight: 400; + position: relative; } } } - h3 { - font-size: em(20px); - } +} +h3 { + font-size: em(20px); +} } .channel-settings { -- cgit v1.2.3-1-g7c22