Skip to content

Commit

Permalink
backport of #7393 - create class for inline positioned lists (#7439)
Browse files Browse the repository at this point in the history
see #7393
affects #6464

Signed-off-by: Michael Gnehr michael@gnehr.de
  • Loading branch information
Cherrg authored and zeripath committed Jul 12, 2019
1 parent 97d4a38 commit f528406
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 18 deletions.
3 changes: 3 additions & 0 deletions public/css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,9 @@ footer .ui.left,footer .ui.right{line-height:40px}
.ui.tabular.menu .item{color:rgba(0,0,0,.5)}
.ui.tabular.menu .item:hover{color:rgba(0,0,0,.8)}
.ui.tabular.menu .item.active{color:rgba(0,0,0,.9)}
.inline-grouped-list{display:inline-block;vertical-align:top}
.inline-grouped-list>.ui{display:block;margin-top:5px;margin-bottom:10px}
.inline-grouped-list>.ui:first-child{margin-top:1px}
.markdown:not(code){overflow:hidden;font-size:16px;line-height:1.6!important;word-wrap:break-word}
.markdown:not(code).ui.segment{padding:3em}
.markdown:not(code).file-view{padding:2em 2em 2em!important}
Expand Down
17 changes: 16 additions & 1 deletion public/less/_base.less
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,6 @@ code,
.file-comment {
font: 12px @monospaced-fonts, monospace;
color: rgba(0, 0, 0, 0.87);

}

.ui.floating.dropdown {
Expand Down Expand Up @@ -877,3 +876,19 @@ footer {
.ui.tabular.menu .item.active {
color: rgba(0, 0, 0, 0.9);
}

/* multiple radio or checkboxes as inline element */
.inline-grouped-list {
display: inline-block;
vertical-align: top;

> .ui {
display: block;
margin-top: 5px;
margin-bottom: 10px;

&:first-child {
margin-top: 1px;
}
}
}
30 changes: 13 additions & 17 deletions templates/org/create.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,19 @@

<div class="inline field {{if .Err_OrgVisibility}}error{{end}}">
<span class="inline required field"><label for="visibility">{{.i18n.Tr "org.settings.visibility"}}</label></span>
<div class="ui radio checkbox">
<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="0" {{if .DefaultOrgVisibilityMode.IsPublic}}checked{{end}}/>
<label>{{.i18n.Tr "org.settings.visibility.public"}}</label>
</div>
</div>
<div class="inline field {{if .Err_OrgVisibility}}error{{end}}">
<label>&nbsp;</label>
<div class="ui radio checkbox">
<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="1" {{if .DefaultOrgVisibilityMode.IsLimited}}checked{{end}}/>
<label>{{.i18n.Tr "org.settings.visibility.limited"}}</label>
</div>
</div>
<div class="inline field {{if .Err_OrgVisibility}}error{{end}}">
<label>&nbsp;</label>
<div class="ui radio checkbox">
<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="2" {{if .DefaultOrgVisibilityMode.IsPrivate}}checked{{end}}/>
<label>{{.i18n.Tr "org.settings.visibility.private"}}</label>
<div class="inline-grouped-list">
<div class="ui radio checkbox">
<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="0" {{if .DefaultOrgVisibilityMode.IsPublic}}checked{{end}}/>
<label>{{.i18n.Tr "org.settings.visibility.public"}}</label>
</div>
<div class="ui radio checkbox">
<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="1" {{if .DefaultOrgVisibilityMode.IsLimited}}checked{{end}}/>
<label>{{.i18n.Tr "org.settings.visibility.limited"}}</label>
</div>
<div class="ui radio checkbox">
<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="2" {{if .DefaultOrgVisibilityMode.IsPrivate}}checked{{end}}/>
<label>{{.i18n.Tr "org.settings.visibility.private"}}</label>
</div>
</div>
</div>
<div class="inline field">
Expand Down

0 comments on commit f528406

Please sign in to comment.