diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2016-01-15 16:34:48 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2016-01-15 16:34:48 +0000 |
commit | d04eadf822fc2513731dead7cd823ec5cd94a7ee (patch) | |
tree | 4bd48d9cfacb1691c7d66cb4cb42faf7ad282747 /app/assets/stylesheets | |
parent | c19795dff596a6a7343460a36f4a430c3bf0eb03 (diff) | |
parent | ef3d5a2712871ab490facfc0764d24edec84a8a6 (diff) | |
download | gitlab-ce-d04eadf822fc2513731dead7cd823ec5cd94a7ee.tar.gz |
Merge branch 'fix-alignment-issue' into 'master'
Fix alignment issues after a fix on titles weight
Fixes #8102. Fixes #3956. This fixes an alignment regression introduced by !2422. Sorry about that! :/
## Commit title alignment fixed
![Screen_Shot_2016-01-14_at_16.10.01](/uploads/8fdc08dca379bc551f5872de910c7149/Screen_Shot_2016-01-14_at_16.10.01.png)
**The fact that the first row has a smaller height than the other rows was not introduced by !2422 (I've checked by reverting 818607f0 on `master`).**
## Tags name in list
![Screen_Shot_2016-01-14_at_16.10.09](/uploads/fba3978037677bb8855f374b5f38dde0/Screen_Shot_2016-01-14_at_16.10.09.png)
See merge request !2431
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/framework/common.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/branches.scss | 3 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/commit.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/groups.scss | 5 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/tags.scss | 3 |
5 files changed, 2 insertions, 15 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 05645116268..585a9d83913 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -75,6 +75,8 @@ hr { @include str-truncated; } +.item-title { font-weight: 600; } + /** FLASH message **/ .author_link { color: $gl-link-color; diff --git a/app/assets/stylesheets/pages/branches.scss b/app/assets/stylesheets/pages/branches.scss deleted file mode 100644 index abae5c3d0a5..00000000000 --- a/app/assets/stylesheets/pages/branches.scss +++ /dev/null @@ -1,3 +0,0 @@ -.branch-name{ - font-weight: 600; -} diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss index 6ec88bdd804..e53d6fc6bdc 100644 --- a/app/assets/stylesheets/pages/commit.scss +++ b/app/assets/stylesheets/pages/commit.scss @@ -2,10 +2,6 @@ display: block; } -.commit-row-title .commit-title { - font-weight: 600; -} - .commit-author, .commit-committer{ display: block; color: #999; diff --git a/app/assets/stylesheets/pages/groups.scss b/app/assets/stylesheets/pages/groups.scss index 3404c2631e1..263993f59a5 100644 --- a/app/assets/stylesheets/pages/groups.scss +++ b/app/assets/stylesheets/pages/groups.scss @@ -11,8 +11,3 @@ height: 42px; } } - -.content-list .group-name { - font-weight: 600; - color: #4c4e54; -} diff --git a/app/assets/stylesheets/pages/tags.scss b/app/assets/stylesheets/pages/tags.scss deleted file mode 100644 index e9cd6dc6c5e..00000000000 --- a/app/assets/stylesheets/pages/tags.scss +++ /dev/null @@ -1,3 +0,0 @@ -.tag-name{ - font-weight: 600; -} |