summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-07-01 12:48:13 +0000
committerRobert Speicher <rspeicher@gmail.com>2016-07-06 12:29:01 -0400
commitee4e66590ba2b3e845dd6be44277d3a18336a422 (patch)
tree25546b557903154824de65e4af20c968f47bcff9 /app/assets/stylesheets/pages
parent9f039661bc61de67e47f189a041c1e28f7266820 (diff)
downloadgitlab-ce-ee4e66590ba2b3e845dd6be44277d3a18336a422.tar.gz
Merge branch '18310-improve-request-access-button' into 'master'
Improve the request / withdraw access button It implements the design proposed in #18310. No. To close #18310. Closes #18310. | Medium | Large | | ----------- | ------- | | ![request_access_button](/uploads/a1de370dcbb8ac9a63d2df5c68591db7/request_access_button.png) | ![request_access_button-large](/uploads/0a1c70380268e620a6ca4d3e1661d58c/request_access_button-large.png) | | Medium | Large | | ----------- | ------- | | ![withdraw_access_request_button](/uploads/c9df39d04b61566ec143d5e9cc43ada2/withdraw_access_request_button.png) | ![withdraw_access_request_button-large](/uploads/10fdaa94d72956e06bdb995e65b51472/withdraw_access_request_button-large.png) | | Medium | Large | | ----------- | ------- | | ![request_access_button](/uploads/8e71395041a5cea996a35df2083bb723/request_access_button.png) | ![project-request_access_button-large](/uploads/adb2dec0eccec8e5171dc0e26e6b03a6/project-request_access_button-large.png) | | Medium | Large | | ----------- | ------- | | ![withdraw_access_request_button](/uploads/12be06f0a2bf9426a5e043f52c4d1dab/withdraw_access_request_button.png) | ![project-withdraw_access_request_button-large](/uploads/93fda7767ee5f02186c4c954ea346254/project-withdraw_access_request_button-large.png) | - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4860 (cherry picked from commit c578fb064c6a90cbaf60959d7706c0bcc34d87f5)
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r--app/assets/stylesheets/pages/groups.scss13
-rw-r--r--app/assets/stylesheets/pages/projects.scss12
2 files changed, 6 insertions, 19 deletions
diff --git a/app/assets/stylesheets/pages/groups.scss b/app/assets/stylesheets/pages/groups.scss
index ac7721cbe15..3d79f4400e2 100644
--- a/app/assets/stylesheets/pages/groups.scss
+++ b/app/assets/stylesheets/pages/groups.scss
@@ -41,18 +41,17 @@
}
.groups-cover-block {
-
.container-fluid {
position: relative;
}
- .access-request-button {
- @include btn-gray;
+ .group-right-buttons {
position: absolute;
right: 16px;
- bottom: 32px;
- padding: 3px 10px;
- text-transform: none;
- background-color: $background-color;
+ .btn {
+ @include btn-gray;
+ padding: 3px 10px;
+ background-color: $background-color;
+ }
}
}
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index d3e59d7fdb9..68641535f18 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -223,18 +223,6 @@
@media (max-width: $screen-md-max) {
top: 0;
}
-
- .access-request-button {
- position: absolute;
- right: 0;
- bottom: 61px;
-
- @media (max-width: $screen-md-max) {
- position: relative;
- bottom: 0;
- margin-right: 10px;
- }
- }
}
@media (max-width: $screen-md-max) {