summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-01 22:56:56 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-01 22:56:56 +0200
commitd1fdefeecdf9305f65a7b78bc0c2218f2dcd9956 (patch)
tree8192a4173db5c3b6f679e1b5584775f8f24f630b /app
parent6e58e7ff7ce151fb7a8329faef69cd3a42194216 (diff)
parent0f96a6c25ad364b1ef945788c463653e93b18d96 (diff)
downloadgitlab-ce-d1fdefeecdf9305f65a7b78bc0c2218f2dcd9956.tar.gz
Merge remote-tracking branch 'origin/master' into downcase-registry-repository
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss25
1 files changed, 24 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 4f8a8748d3f..8046e203a99 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -41,7 +41,7 @@
margin: 0;
margin-left: 20px;
padding: 5px;
- padding-top: 12px;
+ padding-top: 8px;
line-height: 20px;
&.right {
@@ -110,6 +110,29 @@
p:last-child {
margin-bottom: 0;
}
+
+ @media (max-width: $screen-sm-max) {
+ h4 {
+ font-size: 15px;
+ }
+
+ p {
+ font-size: 13px;
+ }
+
+ .btn,
+ .btn-group,
+ .accept-action {
+ width: 100%;
+ margin-bottom: 4px;
+ }
+
+ .accept-control {
+ width: 100%;
+ text-align: center;
+ margin: 0;
+ }
+ }
}
.mr-widget-footer {