summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/framework/issue_box.scss2
-rw-r--r--app/assets/stylesheets/framework/typography.scss4
-rw-r--r--app/assets/stylesheets/framework/variables.scss1
-rw-r--r--app/assets/stylesheets/pages/editor.scss8
-rw-r--r--app/assets/stylesheets/pages/issuable.scss8
-rw-r--r--app/assets/stylesheets/pages/pipelines.scss4
-rw-r--r--app/assets/stylesheets/pages/projects.scss4
7 files changed, 4 insertions, 27 deletions
diff --git a/app/assets/stylesheets/framework/issue_box.scss b/app/assets/stylesheets/framework/issue_box.scss
index 2d672e62e08..a66604e56ff 100644
--- a/app/assets/stylesheets/framework/issue_box.scss
+++ b/app/assets/stylesheets/framework/issue_box.scss
@@ -22,7 +22,7 @@
margin-right: 10px;
color: $white-light;
font-size: $gl-font-size;
- line-height: 25px;
+ line-height: $gl-line-height-24;
&.status-box-closed,
&.status-box-mr-closed {
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index e261bd7c0ca..b3b99df5790 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -360,10 +360,6 @@ code {
font-size: 95%;
}
-.git-revision-dropdown-toggle {
- @extend .monospace;
-}
-
.git-revision-dropdown .dropdown-content ul li a {
@extend .ref-name;
}
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index f4540146a25..b43bb3feef5 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -271,6 +271,7 @@ $context-header-height: 60px;
$breadcrumb-min-height: 48px;
$project-title-row-height: 24px;
$gl-line-height: 16px;
+$gl-line-height-24: 24px;
/*
* Common component specific colors
diff --git a/app/assets/stylesheets/pages/editor.scss b/app/assets/stylesheets/pages/editor.scss
index 04570c057d1..f46ff360496 100644
--- a/app/assets/stylesheets/pages/editor.scss
+++ b/app/assets/stylesheets/pages/editor.scss
@@ -32,7 +32,6 @@
.file-title {
@extend .monospace;
-
line-height: 35px;
padding-top: 7px;
padding-bottom: 7px;
@@ -48,13 +47,6 @@
margin-right: 10px;
}
- .editor-file-name {
- @extend .monospace;
-
- float: left;
- margin-right: 10px;
- }
-
.new-file-name {
display: inline-block;
max-width: 420px;
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 38851de6401..415583cc1c7 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -6,19 +6,16 @@
.issuable-warning-icon {
background-color: $orange-100;
border-radius: $border-radius-default;
- margin: 0 $btn-side-margin 0 0;
width: $issuable-warning-size;
height: $issuable-warning-size;
text-align: center;
+ margin-right: $issuable-warning-icon-margin;
+ line-height: $gl-line-height-24;
.icon {
fill: $orange-600;
vertical-align: text-bottom;
}
-
- &:first-of-type {
- margin-right: $issuable-warning-icon-margin;
- }
}
.limit-container-width {
@@ -689,7 +686,6 @@
flex: 1;
display: inline-block;
font-size: 14px;
- line-height: 24px;
align-self: center;
overflow: hidden;
text-overflow: ellipsis;
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 14395cc59b0..fdd17af35fb 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -141,10 +141,6 @@
float: none;
}
- .api {
- @extend .monospace;
- }
-
.branch-commit {
.ref-name {
font-weight: $gl-font-weight-bold;
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index c7f986247bd..80ec390d18e 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -352,10 +352,6 @@
.mobile-git-clone {
margin-top: $gl-padding-8;
-
- .dropdown-menu-inner-content {
- @extend .monospace;
- }
}
}