diff options
Diffstat (limited to 'webapp/sass')
-rw-r--r-- | webapp/sass/components/_modal.scss | 34 | ||||
-rw-r--r-- | webapp/sass/layout/_forms.scss | 31 | ||||
-rw-r--r-- | webapp/sass/layout/_headers.scss | 46 | ||||
-rw-r--r-- | webapp/sass/routes/_admin-console.scss | 27 | ||||
-rw-r--r-- | webapp/sass/routes/_backstage.scss | 38 |
5 files changed, 88 insertions, 88 deletions
diff --git a/webapp/sass/components/_modal.scss b/webapp/sass/components/_modal.scss index 2348788f4..8796f2c60 100644 --- a/webapp/sass/components/_modal.scss +++ b/webapp/sass/components/_modal.scss @@ -39,38 +39,6 @@ } } - .padding-top { - padding-top: 7px; - - &.x2 { - padding-top: 14px; - } - - &.x3 { - padding-top: 21px; - } - } - - .padding-bottom { - padding-bottom: 7px; - - &.x2 { - padding-bottom: 14px; - } - - &.x3 { - padding-bottom: 21px; - } - - .control-label { - font-weight: 600; - - &.text-left { - text-align: left; - } - } - } - .custom-textarea { border-color: $light-gray; color: inherit; @@ -520,7 +488,7 @@ } .more-modal__row { - border-bottom: 1px solid; + border-bottom: 1px solid $light-gray; display: flex; padding: 8px 15px; } diff --git a/webapp/sass/layout/_forms.scss b/webapp/sass/layout/_forms.scss index 1dd2bb827..7b4e03ad9 100644 --- a/webapp/sass/layout/_forms.scss +++ b/webapp/sass/layout/_forms.scss @@ -60,3 +60,34 @@ } } +.padding-top { + padding-top: 7px; + + &.x2 { + padding-top: 14px; + } + + &.x3 { + padding-top: 21px; + } +} + +.padding-bottom { + padding-bottom: 7px; + + &.x2 { + padding-bottom: 14px; + } + + &.x3 { + padding-bottom: 21px; + } + + .control-label { + font-weight: 600; + + &.text-left { + text-align: left; + } + } +} diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss index e75d2556b..ae114a805 100644 --- a/webapp/sass/layout/_headers.scss +++ b/webapp/sass/layout/_headers.scss @@ -344,32 +344,36 @@ } } -.channel-header__links { - font-family: 'Open Sans', sans-serif; - font-size: 22px; - height: 30px; - line-height: 26px; - margin-right: 9px; - width: 24px; - - .channel__wrap.move--left & { - position: absolute; - right: -400px; - top: 14px; - } +.app__body { - > a { - @include opacity(.6); - @include single-transition(all, .1s, ease-in); - color: inherit; - text-decoration: none; + .channel-header__links { + font-family: 'Open Sans', sans-serif; + font-size: 22px; + height: 30px; + line-height: 26px; + margin-right: 9px; + width: 24px; - &:hover { - @include opacity(1); + .channel__wrap.move--left & { + position: absolute; + right: -400px; + top: 14px; } - &:focus { + > a { + @include opacity(.6); + @include single-transition(all, .1s, ease-in); color: inherit; + text-decoration: none; + + &:hover { + @include opacity(1); + } + + &:focus { + color: inherit; + } } } + } diff --git a/webapp/sass/routes/_admin-console.scss b/webapp/sass/routes/_admin-console.scss index 73e8f816c..faa66e08b 100644 --- a/webapp/sass/routes/_admin-console.scss +++ b/webapp/sass/routes/_admin-console.scss @@ -17,14 +17,9 @@ padding-bottom: .5em; } - .table { - background: $white; - } - .form-control { background-color: $white; - border: 1px solid #ccc; - color: #555; + border: 1px solid $light-gray; &:focus { @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6)); @@ -33,26 +28,6 @@ } } - .btn { - color: #333; - - &.btn-primary { - background: $primary-color; - - &:hover, - &:focus, - &:active { - background: #1c6dab; - } - } - } - - .dropdown-menu { - background: $white; - border: 1px solid rgba(0,0,0,.15); - color: inherit; - } - .sidebar--left { &.sidebar--collapsable { background: #333; diff --git a/webapp/sass/routes/_backstage.scss b/webapp/sass/routes/_backstage.scss index 9b115a132..4b0c07b7e 100644 --- a/webapp/sass/routes/_backstage.scss +++ b/webapp/sass/routes/_backstage.scss @@ -3,19 +3,20 @@ body { height: auto; overflow: auto; - .sidebar--right { - display: none; - } - - .navbar { - display: none; - } - .inner-wrap { + @include translateX(0); + margin-right: 0 !important; + &:before { display: none; } } + + .sidebar--right, + .sidebar--menu, + .navbar { + display: none; + } } } @@ -240,6 +241,17 @@ body { font-weight: normal; } + .radio, + .checkbox { + input { + height: 16px; + margin: 0 5px 0 0; + position: relative; + top: 2px; + width: 16px; + } + } + .form-control { background: $white; @@ -247,6 +259,16 @@ body { border-color: $primary-color; } } + + .form__help { + color: $dark-gray; + font-size: .95em; + margin-top: 1em; + + & + .form__help { + margin-top: .4em; + } + } } .backstage-form__footer { |