summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/blocks.scss7
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/mixins.scss1
-rw-r--r--app/assets/stylesheets/sections/dashboard.scss6
3 files changed, 4 insertions, 10 deletions
diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
index 5e1d7f758fe..3101dfc097b 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
@@ -88,13 +88,10 @@
text-shadow: 0 1px 1px #fff;
padding: 10px;
font-size: 14px;
+ line-height: 20px;
font-weight: normal;
margin: 0;
- h5 {
- margin: 0;
- }
-
> a {
text-shadow: 0 1px 1px #fff;
}
@@ -106,7 +103,7 @@
.btn {
position: relative;
- top: -2px;
+ margin-top: -2px;
}
.nav-pills {
diff --git a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
index eed7cb78e93..71e73b40b44 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
@@ -77,7 +77,6 @@
@mixin md-typography {
code { padding: 0 4px; }
- p { font-size: 14px; }
h1 { margin-top: 30px;}
h2 { margin-top: 25px;}
h3 { margin-top: 20px;}
diff --git a/app/assets/stylesheets/sections/dashboard.scss b/app/assets/stylesheets/sections/dashboard.scss
index ff78af33967..3a69dde1af4 100644
--- a/app/assets/stylesheets/sections/dashboard.scss
+++ b/app/assets/stylesheets/sections/dashboard.scss
@@ -10,8 +10,8 @@
margin: 0px;
box-shadow: none;
- > .title {
- padding: 2px 15px;
+ .title .btn {
+ margin: 0;
}
.nav-projects-tabs li { padding: 0; }
}
@@ -37,8 +37,6 @@
padding: 4px 6px;
width: 202px;
float: left;
- margin-top: 3px;
- margin-left: -2px;
}
}