IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: mobile modal close button position, mobile layout of radio buttons and checkboxes

Browse Source
This commit is contained in:
Neil Lalonde 2017-05-18 17:08:45 -04:00
parent ed4b2b6d8d
commit fa77bbf04f
5 changed files with 41 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/templates/modal.hbs
View File

@ -3,11 +3,11 @@
<div class="modal-middle-container"> <div class="modal-middle-container">
<div class="modal-inner-container"> <div class="modal-inner-container">
<div class="modal-header"> <div class="modal-header">
<h3>{{title}}</h3>
<div class='modal-close'> <div class='modal-close'>
<a class="close" {{action "closeModal"}}>{{fa-icon "times"}}</a> <a class="close" {{action "closeModal"}}>{{fa-icon "times"}}</a>
</div> </div>
<h3>{{title}}</h3>
</div> </div>
<div id='modal-alert'></div> <div id='modal-alert'></div>

37
app/assets/stylesheets/common/base/discourse.scss
View File

@ -149,6 +149,43 @@ body {
.profiler-results.profiler-left { .profiler-results.profiler-left {
top: 60px !important; top: 60px !important;
} }
label {
display: block;
margin-bottom: 5px;
}
input {
&[type="radio"], &[type="checkbox"] {
margin: 3px 0;
line-height: normal;
cursor: pointer;
}
&[type="submit"], &[type="reset"], &[type="button"], &[type="radio"], &[type="checkbox"] {
width: auto;
}
}
.radio, .checkbox {
min-height: 18px;
padding-left: 18px;
}
.radio input[type="radio"], .checkbox input[type="checkbox"] {
float: left;
margin-left: -18px;
}
.controls > {
.radio:first-child, .checkbox:first-child {
padding-top: 5px;
}
}
.radio.inline, .checkbox.inline {
display: inline-block;
padding-top: 5px;
margin-bottom: 0;
vertical-align: middle;
}
.radio.inline .radio.inline, .checkbox.inline .checkbox.inline {
margin-left: 10px;
}
} }
.unread-private-messages { .unread-private-messages {

37
app/assets/stylesheets/desktop/discourse.scss
View File

@ -191,10 +191,6 @@ body {
input, button, select, textarea { input, button, select, textarea {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
} }
label {
display: block;
margin-bottom: 5px;
}
select, textarea { select, textarea {
display: inline-block; display: inline-block;
padding: 4px; padding: 4px;
@ -246,17 +242,6 @@ body {
} }
} }
input {
&[type="radio"], &[type="checkbox"] {
margin: 3px 0;
line-height: normal;
cursor: pointer;
}
&[type="submit"], &[type="reset"], &[type="button"], &[type="radio"], &[type="checkbox"] {
width: auto;
}
}
select, input[type="file"] { select, input[type="file"] {
line-height: 28px; line-height: 28px;
} }
@ -269,28 +254,6 @@ body {
} }
} }
.radio, .checkbox {
min-height: 18px;
padding-left: 18px;
}
.radio input[type="radio"], .checkbox input[type="checkbox"] {
float: left;
margin-left: -18px;
}
.controls > {
.radio:first-child, .checkbox:first-child {
padding-top: 5px;
}
}
.radio.inline, .checkbox.inline {
display: inline-block;
padding-top: 5px;
margin-bottom: 0;
vertical-align: middle;
}
.radio.inline .radio.inline, .checkbox.inline .checkbox.inline {
margin-left: 10px;
}
.input-xxlarge { .input-xxlarge {
width: 530px; width: 530px;
} }

4
app/assets/stylesheets/mobile/discourse.scss
View File

@ -56,10 +56,6 @@ body {
.control-group { .control-group {
margin-bottom: 9px; margin-bottom: 9px;
} }
label {
display: block;
margin-bottom: 5px;
}
} }
blockquote { blockquote {

5
app/assets/stylesheets/mobile/modal.scss
View File

@ -55,12 +55,11 @@
} }
.modal-header { .modal-header {
padding: 10px 0px; padding: 10px 0px 10px 10px;
h3 { h3 {
display: inline-block; display: inline;
font-size: 1.286em; font-size: 1.286em;
padding-left: 15px;
margin: 0px; margin: 0px;
} }
} }