diff options
author | =Corey Hulen <corey@hulen.com> | 2015-09-14 16:59:24 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-09-14 16:59:24 -0700 |
commit | 3bd350dcaf65a89040f7ea395a19b620819ba03e (patch) | |
tree | 72b49e6fadfc1d513489b8938d5f73620ff2a6d8 /web/sass-files/sass/partials | |
parent | e06e292be71ca699d90bafbd635118aa47c2d7a5 (diff) | |
parent | bfebb41bc0c0a1c5f481617f912bdf6dd483c341 (diff) | |
download | chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.tar.gz chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.tar.bz2 chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.zip |
Merge branch 'master' into PLT-12-log
Diffstat (limited to 'web/sass-files/sass/partials')
-rw-r--r-- | web/sass-files/sass/partials/_forms.scss | 33 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_headers.scss | 2 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_modal.scss | 3 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_sidebar--left.scss | 7 |
4 files changed, 42 insertions, 3 deletions
diff --git a/web/sass-files/sass/partials/_forms.scss b/web/sass-files/sass/partials/_forms.scss new file mode 100644 index 000000000..268576a98 --- /dev/null +++ b/web/sass-files/sass/partials/_forms.scss @@ -0,0 +1,33 @@ +.form-horizontal { + .modal-intro { + margin: -10px 0 30px; + } + .form__label { + text-align: left; + padding-right: 3px; + font-weight: bold; + font-size: 1.1em; + &.light { + color: #999; + font-size: 1.05em; + font-style: italic; + padding-top: 2px; + } + } + .input__help { + color: #777; + margin: 10px 0 0 10px; + &.error { + color: #a94442; + } + } + .form-control { + font-weight: normal; + } + .form-group { + margin-bottom: 25px; + &.less { + margin-bottom: 10px; + } + } +} diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss index c311941b6..e83981397 100644 --- a/web/sass-files/sass/partials/_headers.scss +++ b/web/sass-files/sass/partials/_headers.scss @@ -145,6 +145,8 @@ li a { padding: 3px 20px; color: #555; + text-overflow: ellipsis; + overflow: hidden; } } .dropdown__icon { diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index d32306cbc..a046cd904 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -123,6 +123,7 @@ } .more-channel-table { margin: 0; + table-layout: fixed; p { font-size: 0.9em; overflow: hidden; @@ -154,7 +155,7 @@ &.td--action { text-align: right; padding: 8px 15px 8px 8px; - width: 70px; + width: 80px; vertical-align: middle; } } diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss index d4ed41130..514d22f24 100644 --- a/web/sass-files/sass/partials/_sidebar--left.scss +++ b/web/sass-files/sass/partials/_sidebar--left.scss @@ -12,7 +12,10 @@ } .dropdown-menu { max-height: 300px; - overflow: auto; + overflow-x: hidden; + overflow-y: auto; + max-width: 200px; + width: 200px; } .search__form { margin: 0; @@ -49,7 +52,7 @@ left: 0; right: 0; width: 72%; - color: #777; + color: #fff; background: #2389D7; @include border-radius(50px); margin: 0 auto; |