summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Hampton <shampton@gitlab.com>2019-06-04 13:59:40 -0700
committerScott Hampton <shampton@gitlab.com>2019-06-04 13:59:40 -0700
commit94a6bc92e66bc44b088e75670aa4dd4960436f02 (patch)
treec0c6e06eddcc6471a9322bfe94fc5a79c30c9444
parentb61de48c5ee9d7061003c39960472055fa9a364e (diff)
downloadgitlab-ce-suggestion-popover-reviewapp-branch.tar.gz
Fixing some stray button dimensionssuggestion-popover-reviewapp-branch
MR suggestions pointed out some buttons that were not included before. This commit fixes some of them.
-rw-r--r--app/assets/stylesheets/framework/animations.scss2
-rw-r--r--app/assets/stylesheets/framework/buttons.scss11
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss7
-rw-r--r--app/assets/stylesheets/pages/projects.scss4
-rw-r--r--app/assets/stylesheets/pages/tree.scss8
5 files changed, 23 insertions, 9 deletions
diff --git a/app/assets/stylesheets/framework/animations.scss b/app/assets/stylesheets/framework/animations.scss
index 257d788873c..7dffe5bb4eb 100644
--- a/app/assets/stylesheets/framework/animations.scss
+++ b/app/assets/stylesheets/framework/animations.scss
@@ -104,7 +104,7 @@
}
.btn {
- @include transition(background-color, border-color, color, box-shadow);
+ @include transition(border-color, box-shadow);
}
.dropdown-menu-toggle,
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index fd1a3cf1c91..e68388e2e42 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -24,7 +24,7 @@
border-radius: $border-radius-default;
font-size: $gl-font-size;
font-weight: $gl-font-weight-normal;
- padding: ($gl-vert-padding + 1px) $gl-btn-horz-padding;
+ padding: ($gl-vert-padding + 1px) ($gl-btn-padding + 1px);
&:focus,
&:active {
@@ -36,7 +36,7 @@
&:focus,
&:active {
border-width: 2px;
- padding: $gl-vert-padding ($gl-btn-horz-padding - 1px);
+ padding: $gl-vert-padding $gl-btn-padding;
}
}
@@ -333,6 +333,12 @@
&.btn {
padding: 6px 0;
+
+ &:hover,
+ &:active,
+ &:focus {
+ padding: 5px 0;
+ }
}
}
@@ -501,6 +507,7 @@
&:active,
&:focus {
color: $gl-text-color-secondary;
+ border: 2px dashed $border-gray-normal-dashed;
background-color: $white-normal;
}
}
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 0c65dd61755..bcb1d5bfc43 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -64,10 +64,11 @@
}
.dropdown-toggle {
- padding: $gl-vert-padding $gl-padding-8;
+ padding: ($gl-vert-padding + 1px) ($gl-btn-padding + 1px);
background-color: $white-light;
color: $gl-text-color;
font-size: 14px;
+ line-height: $gl-btn-line-height;
text-align: left;
border: 1px solid $border-color;
border-radius: $border-radius-base;
@@ -127,7 +128,7 @@
&.btn:hover,
&.btn:focus,
&.btn:active {
- padding: ($gl-vert-padding - 1px) ($gl-padding-8 - 1px);
+ padding: $gl-vert-padding $gl-btn-padding;
}
}
@@ -151,7 +152,7 @@
.fa-chevron-down,
.fa-spinner {
position: absolute;
- top: 11px;
+ top: 10px;
right: 8px;
}
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 151af843c95..279846cfffe 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -429,7 +429,7 @@
padding: 0;
background: transparent;
border: 0;
- line-height: 34px;
+ line-height: 32px;
margin: 0;
> li + li::before {
@@ -792,7 +792,7 @@
.btn {
margin-top: $gl-padding;
- padding: $gl-btn-vert-padding $gl-btn-padding;
+ // padding: $gl-btn-vert-padding $gl-btn-padding;
line-height: $gl-btn-line-height;
.icon {
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index 5664f46484e..aa1a96da13f 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -90,7 +90,13 @@
.add-to-tree {
vertical-align: top;
- padding: 8px;
+ padding: ($gl-vert-padding + 1px);
+
+ &:hover,
+ &:active,
+ &:focus {
+ padding: $gl-vert-padding;
+ }
svg {
top: 0;