diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-03 11:43:16 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-03 11:43:16 +0000 |
commit | 729618c50fbe44d6c4bdcbdd6d15e3eaec2067a4 (patch) | |
tree | 107ddb99076f34e67bca693289138952c1eb0d0d /app/assets | |
parent | 67b0857d29d0ad56771ce5ea4316f6057c64db66 (diff) | |
parent | 95d61a094d4d69fc332b40923ba08bbb57776f39 (diff) | |
download | gitlab-ce-729618c50fbe44d6c4bdcbdd6d15e3eaec2067a4.tar.gz |
Merge branch 'ui-improvements' into 'master'
Ui improvements
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/images/Storage-UI.PNG | bin | 737 -> 0 bytes | |||
-rw-r--r-- | app/assets/images/file_bin.png | bin | 219 -> 0 bytes | |||
-rw-r--r-- | app/assets/images/file_dir.png | bin | 1648 -> 0 bytes | |||
-rw-r--r-- | app/assets/images/file_empty.png | bin | 319 -> 0 bytes | |||
-rw-r--r-- | app/assets/images/file_img.png | bin | 536 -> 0 bytes | |||
-rw-r--r-- | app/assets/images/file_txt.png | bin | 463 -> 0 bytes | |||
-rw-r--r-- | app/assets/images/rss_ui.png | bin | 812 -> 0 bytes | |||
-rw-r--r-- | app/assets/images/submodule.png | bin | 641 -> 0 bytes | |||
-rw-r--r-- | app/assets/stylesheets/generic/forms.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/generic/typography.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/main/mixins.scss | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/sections/admin.scss | 22 | ||||
-rw-r--r-- | app/assets/stylesheets/sections/tree.scss | 4 |
13 files changed, 28 insertions, 9 deletions
diff --git a/app/assets/images/Storage-UI.PNG b/app/assets/images/Storage-UI.PNG Binary files differdeleted file mode 100644 index 8ab6678de32..00000000000 --- a/app/assets/images/Storage-UI.PNG +++ /dev/null diff --git a/app/assets/images/file_bin.png b/app/assets/images/file_bin.png Binary files differdeleted file mode 100644 index b3feafcce0b..00000000000 --- a/app/assets/images/file_bin.png +++ /dev/null diff --git a/app/assets/images/file_dir.png b/app/assets/images/file_dir.png Binary files differdeleted file mode 100644 index ea277bb14db..00000000000 --- a/app/assets/images/file_dir.png +++ /dev/null diff --git a/app/assets/images/file_empty.png b/app/assets/images/file_empty.png Binary files differdeleted file mode 100644 index 2e85bb48737..00000000000 --- a/app/assets/images/file_empty.png +++ /dev/null diff --git a/app/assets/images/file_img.png b/app/assets/images/file_img.png Binary files differdeleted file mode 100644 index ca554c5aefe..00000000000 --- a/app/assets/images/file_img.png +++ /dev/null diff --git a/app/assets/images/file_txt.png b/app/assets/images/file_txt.png Binary files differdeleted file mode 100644 index b3230b5add0..00000000000 --- a/app/assets/images/file_txt.png +++ /dev/null diff --git a/app/assets/images/rss_ui.png b/app/assets/images/rss_ui.png Binary files differdeleted file mode 100644 index c45afbab519..00000000000 --- a/app/assets/images/rss_ui.png +++ /dev/null diff --git a/app/assets/images/submodule.png b/app/assets/images/submodule.png Binary files differdeleted file mode 100644 index 62a88cc619b..00000000000 --- a/app/assets/images/submodule.png +++ /dev/null diff --git a/app/assets/stylesheets/generic/forms.scss b/app/assets/stylesheets/generic/forms.scss index 36551f85b6a..bd9d4bceb83 100644 --- a/app/assets/stylesheets/generic/forms.scss +++ b/app/assets/stylesheets/generic/forms.scss @@ -98,3 +98,7 @@ label { z-index: 2; } } + +.fieldset-form fieldset { + margin-bottom: 20px; +} diff --git a/app/assets/stylesheets/generic/typography.scss b/app/assets/stylesheets/generic/typography.scss index 4ab83786b50..9aa819d40fc 100644 --- a/app/assets/stylesheets/generic/typography.scss +++ b/app/assets/stylesheets/generic/typography.scss @@ -14,6 +14,7 @@ h2.page-title { h3.page-title { @include page-title; + font-size: 22px; } h6 { diff --git a/app/assets/stylesheets/main/mixins.scss b/app/assets/stylesheets/main/mixins.scss index 747676620b3..289490712b6 100644 --- a/app/assets/stylesheets/main/mixins.scss +++ b/app/assets/stylesheets/main/mixins.scss @@ -117,11 +117,11 @@ } @mixin page-title { - color: #333; - font-size: 20px; + color: #555; line-height: 1.5; + font-weight: normal; margin-top: 0px; - margin-bottom: 15px; + margin-bottom: 10px; } @mixin str-truncated($max_width: "82%") { diff --git a/app/assets/stylesheets/sections/admin.scss b/app/assets/stylesheets/sections/admin.scss index a558633d112..a51deee7970 100644 --- a/app/assets/stylesheets/sections/admin.scss +++ b/app/assets/stylesheets/sections/admin.scss @@ -21,12 +21,22 @@ } .admin-filter form { - label { width: 110px; } - .controls { margin-left: 130px; } - .form-actions { padding-left: 130px; background: #fff } - .visibility-levels { - .controls { - margin-bottom: 9px; + .select2-container { + width: 100% + } + + .controls { + margin-left: 130px; + } + + .form-actions { + padding-left: 130px; + background: #fff + } + + .visibility-levels { + .controls { + margin-bottom: 9px; } i { diff --git a/app/assets/stylesheets/sections/tree.scss b/app/assets/stylesheets/sections/tree.scss index db177a0083c..b0ce78ddb35 100644 --- a/app/assets/stylesheets/sections/tree.scss +++ b/app/assets/stylesheets/sections/tree.scss @@ -57,6 +57,10 @@ } } + i { + color: $bg_primary; + } + img { position: relative; top:-1px; |