Skip to content

Commit d4aaae5

Browse files
committed
Merge pull request #568 from Martii/smallerAlerts
Smaller alerts Auto-merge
2 parents 857e4cd + 5ec0c3b commit d4aaae5

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

public/less/bootstrap/oujs-bootswatch.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,10 @@ table {
130130
background-color: @gray-dark;
131131
}
132132

133+
// Staged =====================================================================
134+
.close {
135+
font-size: @close-font-size;
136+
}
133137

134138
// Unstaged ===================================================================
135139

public/less/bootstrap/oujs-variables.less

Lines changed: 2 additions & 1 deletion
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: 15px;
593+
@alert-padding: 10px;
594594
@alert-border-radius: @border-radius-base;
595595
@alert-link-font-weight: bold;
596596

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

780780
@close-font-weight: bold;
781+
@close-font-size: (@font-size-base * 1.25);
781782
@close-color: #000;
782783
@close-text-shadow: 0 1px 0 #fff;
783784

views/includes/headerReminders.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div>
2-
<div class="alert alert-info alert-dismissible" role="alert">
2+
<div class="alert alert-info alert-dismissible small" 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>

views/pages/loginPage.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ <h3>
4242
<button class="btn btn-info" type="submit">Register <i class="fa fa-sign-in fa-fw"></i></button>
4343
</span>
4444
</div>
45-
<div class="alert alert-warning" role="alert">
45+
<div class="alert alert-warning small" role="alert">
4646
<i class="fa fa-exclamation-triangle"></i> <strong>CAUTION</strong>: The unique Username that you choose to sign up with here will be displayed to everyone. It is strongly recommended to <strong>not</strong> use an email address.
4747
</div>
4848
</form>

views/pages/scriptIssueListPage.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</a>
2424
</div>
2525
{{#script.hasSupport}}
26-
<div class="alert alert-success alert-dismissible" role="alert">
26+
<div class="alert alert-success alert-dismissible small" role="alert">
2727
<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
2828
{{#script.support}}<p><i class="fa fa-fw fa-support"></i> <b>Support:</b> <a href="{{{url}}}"{{#hasNoFollow}} rel="nofollow"{{/hasNoFollow}}>{{text}}</a></p>{{/script.support}}
2929
The script author requests that you use their preferred primary support method when filing an issue. Please consider using that for regular issues.

0 commit comments

Comments
 (0)