Skip to content

Commit 5c3d597

Browse files
committed
Merge pull request #569 from Martii/snugUpReminders
Snug up top reminders in CSS Auto-merge
2 parents d4aaae5 + b48fb71 commit 5c3d597

3 files changed

Lines changed: 18 additions & 6 deletions

File tree

public/less/bootstrap/oujs-bootswatch.less

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,21 @@ table {
131131
}
132132

133133
// Staged =====================================================================
134-
.close {
135-
font-size: @close-font-size;
134+
body > .navbar {
135+
margin-bottom: 0;
136+
}
137+
138+
.reminders {
139+
margin-bottom: @line-height-computed;
140+
}
141+
142+
.reminders .alert.small {
143+
margin-bottom: 0;
144+
padding: (@alert-padding * 0.66)
145+
}
146+
147+
.reminders .alert.small .close {
148+
font-size: (@font-size-base * 1.25);
136149
}
137150

138151
// Unstaged ===================================================================

public/less/bootstrap/oujs-variables.less

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@
590590
//
591591
//## Define alert colors, border radius, and padding.
592592

593-
@alert-padding: 10px;
593+
@alert-padding: 15px;
594594
@alert-border-radius: @border-radius-base;
595595
@alert-link-font-weight: bold;
596596

@@ -778,7 +778,6 @@
778778
//##
779779

780780
@close-font-weight: bold;
781-
@close-font-size: (@font-size-base * 1.25);
782781
@close-color: #000;
783782
@close-text-shadow: 0 1px 0 #fff;
784783

views/includes/headerReminders.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<div>
2-
<div class="alert alert-info alert-dismissible small" role="alert">
1+
<div class="reminders">
2+
<div class="alert alert-info alert-dismissible small fade in" role="alert">
33
<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
44
<p><i class="fa fa-fw fa-exclamation-triangle"></i> <b>REMINDER:</b> Don't miss out reading the <a class="alert-link" href="/announcements/Google_Authentication_Deprecation">Google Authentication Deprecation</a> with migration announcement.</p>
55
</div>

0 commit comments

Comments
 (0)