diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-29 20:21:31 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-29 20:21:31 +0300 |
| commit | 57a49b340e0c8689024fefda53707a8f9b73efa5 (patch) | |
| tree | 6feacc1d25cb413fa15c231c0b9c0e3bb5fe2b87 /app/assets | |
| parent | 40c3675372320febf5264061c9bcd63db2dfd13c (diff) | |
| parent | 6920fd3dddf2960204545f64ca37b2e56972b2d7 (diff) | |
Merge branch 'repo-buttons' into 'master'
Repo buttons
Fixes #796
Moved the star & fork button to inline with the other buttons.
See merge request !473
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/generic/mobile.scss | 7 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 30 |
2 files changed, 11 insertions, 26 deletions
diff --git a/app/assets/stylesheets/generic/mobile.scss b/app/assets/stylesheets/generic/mobile.scss index 1b0e056216f..71a1fc4493f 100644 --- a/app/assets/stylesheets/generic/mobile.scss +++ b/app/assets/stylesheets/generic/mobile.scss @@ -24,13 +24,6 @@ display: none !important; } - .project-home-panel { - .star-fork-buttons { - padding-top: 10px; - padding-right: 15px; - } - } - .project-home-links { display: none; } diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 6d55a5fa66e..de39fc3e9fb 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -48,9 +48,12 @@ .project-home-row { @extend .clearfix; margin-bottom: 15px; + + &.project-home-row-top { + margin-bottom: 11px; + } - .project-home-desc, - .star-fork-buttons { + .project-home-desc { font-size: 16px; line-height: 1.3; } @@ -60,23 +63,8 @@ color: #666; } - .star-fork-buttons { - float: right; - min-width: 200px; - font-weight: bold; - - .star-buttons, .fork-buttons { - float: right; - margin-left: 20px; - - a:hover { - text-decoration: none; - } - - .count { - margin-left: 5px; - } - } + .btn-action-count { + margin-left: 5px; } } @@ -87,6 +75,10 @@ color: inherit; } } + + .project-repo-buttons { + margin-top: -5px; + } } .project-home-links { |