Merge branch 'ui-improvements' into 'master'

Ui improvements

13 files changed, 28 insertions, 9 deletions

diff --git a/app/assets/images/Storage-UI.PNG b/app/assets/images/Storage-UI.PNG
deleted 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
deleted 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
deleted 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
deleted 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
deleted 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
deleted 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
deleted 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
deleted 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;