summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorEzekiel Kigbo <ekigbo@gitlab.com>2019-04-12 14:14:28 +0200
committerEzekiel Kigbo <ekigbo@gitlab.com>2019-05-06 16:41:47 +0100
commitaebf22f639073ab4d5c0ff4970d60bf24e8879f0 (patch)
tree72f9b9c8f7f33990aab4410d746be2f267ad3f49 /app/assets/stylesheets
parentc1f5205d9123d7f497d56235b4330145ef80a652 (diff)
downloadgitlab-ce-aebf22f639073ab4d5c0ff4970d60bf24e8879f0.tar.gz
Ensure we dont apply changes to admin/projects
The changes introduced for the project filter bar should not apply to the admin projects screen. Remove "Owned by me", "Owned by anyone" options Update the dropdown option Last created -> Created date. Introduces fixes for spacing and minor styling across breakpoints.
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/pages/projects.scss36
1 files changed, 22 insertions, 14 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index d6422a4d425..ba57d6e12ec 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -1470,10 +1470,6 @@ pre.light-well {
}
}
- .filter-with-icon {
- border-radius: 3px 0 0 3px;
- }
-
.filtered-search-wrapper {
flex-wrap: nowrap;
flex-direction: row;
@@ -1494,9 +1490,9 @@ pre.light-well {
}
.filtered-search-dropdown-label {
- padding: 0 8px 0 16px;
+ padding: 0 0 0 16px;
font-weight: bold;
- min-width: 76px;
+ min-width: 68px;
}
.filtered-search {
@@ -1525,6 +1521,10 @@ pre.light-well {
border-radius: 3px 0 0 3px;
}
+ .dropdown-menu-toggle {
+ margin-left: 8px;
+ }
+
@include media-breakpoint-down(lg) {
.filtered-search {
min-width: 15%;
@@ -1534,18 +1534,23 @@ pre.light-well {
}
}
- .extended-filtered-search.filtered-search {
- margin-left: 0;
- min-width: 65%;
+ .extended-filtered-search-box {
+ margin: 0;
+ min-width: 45%;
}
}
@include media-breakpoint-down(md) {
- .filtered-search {
+ .filtered-search:not(.extended-filtered-search-box) {
margin: 0 0 8px 16px;
min-width: 30%;
}
+ .extended-filtered-search-box {
+ margin: 0 0 8px;
+ min-width: 55%;
+ }
+
.filtered-search-nav {
margin: 0 0 8px;
}
@@ -1586,6 +1591,7 @@ pre.light-well {
width: 100%;
}
+ .filtered-search:not(.extended-filtered-search-box),
.filtered-search {
margin-left: 0;
}
@@ -1600,14 +1606,16 @@ pre.light-well {
.filtered-search-dropdown {
margin: 0 0 8px;
+
+ &:last-of-type {
+ margin: 0;
+ }
}
.filtered-search-dropdown-label {
- padding-left: 0;
+ padding: 0;
+ min-width: 60px;
}
-
}
-
-
}