diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-31 15:06:26 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-31 15:06:26 +0300 |
| commit | 0be510a49f6e4f8e27b19b707fd1dac61571f78f (patch) | |
| tree | 97ca0053d4fad66e900d25fdba61b2adb611efb0 /app/assets | |
| parent | 6026bddcd51eca573c530240c421392045172b89 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 21 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/utilities.scss | 6 |
3 files changed, 29 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index dfc39d8e03b..a7d94281008 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -21,6 +21,27 @@ $spacing-scale: ( ); /* + * Why another sizing scale??? + * Great question, friend! + * This size scale is a "backport" of the equivalent set of "named" sizes + * (e.g. `xl` versus `70`) that came from the following design document as of 2019-10-23: + * + * https://gitlab-org.gitlab.io/gitlab-design/hosted/design-gitlab-specs/forms-spec-previews/ + * + * (See `input-` items at the bottom) + * + * The presumption here is that these sizes will be standardized in GitLab UI and thus will be + * broadly useful here in the GitLab product when not using the GitLab UI components. + */ +$size-scale: ( + 'xs': #{10 * $grid-size}, + 's': #{20 * $grid-size}, + 'm': #{30 * $grid-size}, + 'l': #{40 * $grid-size}, + 'xl': #{70 * $grid-size} +); + +/* * Color schema */ $darken-normal-factor: 7%; diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index b2c1d0b6dc5..3f8bdc82eff 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -252,6 +252,7 @@ .fa-caret-down { margin-left: 3px; + line-height: 0; &.dropdown-btn-icon { margin-left: 0; @@ -269,7 +270,7 @@ } .count-badge, - .btn-xs { + .btn { height: 24px; } diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss index d2906ce0780..4a0b6ac1ddd 100644 --- a/app/assets/stylesheets/utilities.scss +++ b/app/assets/stylesheets/utilities.scss @@ -16,6 +16,12 @@ } } +@each $index, $size in $size-scale { + #{'.mw-#{$index}'} { + max-width: $size; + } +} + .border-width-1px { border-width: 1px; } .border-style-dashed { border-style: dashed; } .border-style-solid { border-style: solid; } |