harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

Browse Source
This commit is contained in:
zotlabs 2017-03-31 17:27:18 -07:00
commit 7256579c16
14 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boot.php
View File

@ -48,7 +48,6 @@ require_once('include/xchan.php');
require_once('include/hubloc.php'); require_once('include/hubloc.php');
define ( 'PLATFORM_NAME', 'red' ); define ( 'PLATFORM_NAME', 'red' );
define ( 'STD_VERSION', '5.3' ); define ( 'STD_VERSION', '5.3' );
@ -2301,7 +2300,10 @@ function cert_bad_email() {
) )
] ]
); );
<<<<<<< HEAD
=======
>>>>>>> 95f4f14dca1ea982f67cccb31d860f7b8ed9055c
} }

16
view/css/bootstrap-red.css vendored
View File

@ -48,6 +48,7 @@ nav.navbar {
#navbar-collapse-2 { #navbar-collapse-2 {
flex-basis: 100%; flex-basis: 100%;
max-height: 70vh;
} }
#navbar-collapse-2.show { #navbar-collapse-2.show {
@ -59,6 +60,10 @@ nav.navbar {
} }
/* nav overrides end */ /* nav overrides end */
.btn-outline-secondary {
color: #aaa;
}
.wall-item-tools .dropdown-menu { .wall-item-tools .dropdown-menu {
min-width: auto; min-width: auto;
} }
@ -67,6 +72,11 @@ code {
white-space: normal; white-space: normal;
} }
/* Bootstrap assumes that checkboxes are on the left of labels, while it's usually the opposite in Red */ .form-group label {
.field.checkbox input[type="checkbox"] { margin-left: 0px; } font-weight: bold;
.field.checkbox label { padding-left: 0px; font-weight: 700} }
small,
.small {
font-size: 0.75rem;
}

16
view/css/widgets.css
View File

@ -143,18 +143,14 @@ li:hover .group-edit-icon {
bottom: 0px; bottom: 0px;
left: 0px; left: 0px;
width: 100%; width: 100%;
padding: 15px; padding: 1rem;
}
#cover-photo-caption h1,
#cover-photo-caption h3 {
color: #fff; color: #fff;
font-weight: bold; font-weight: bold;
text-shadow: 1px 1px 3px rgba(0,0,0,.7); text-shadow: 1px 1px 3px rgba(0,0,0,0.5);
}
.cover-photo-title {
font-size: 30px;
}
.cover-photo-subtitle {
font-size: 20px;
} }
a.wikilist { a.wikilist {

20
view/theme/redbasic/css/style.css
View File

@ -117,7 +117,7 @@ a:focus,
} }
input, optgroup, select, textarea { input, optgroup, select, textarea {
color: $font_colour; font-size: 0.9rem !important;
resize: vertical; resize: vertical;
} }
@ -196,7 +196,7 @@ nav {
width: 100%; width: 100%;
max-height: 50%; max-height: 50%;
background: $comment_item_colour; background: $comment_item_colour;
padding: 20px; padding: 1rem;
border-bottom: #ccc 1px solid; border-bottom: #ccc 1px solid;
overflow: auto; overflow: auto;
-moz-box-shadow: 0px 3px 3px rgba(0,0,0,0.2); -moz-box-shadow: 0px 3px 3px rgba(0,0,0,0.2);
@ -1059,8 +1059,6 @@ img.mail-conv-sender-photo {
height: $reply_photo; height: $reply_photo;
} }
.wall-item-ago, .wall-item-ago,
.dropdown-sub-text { .dropdown-sub-text {
color: #777; color: #777;
@ -1480,17 +1478,17 @@ dl.bb-dl > dd > li {
/* Turn checkboxes into switches */ /* Turn checkboxes into switches */
.field.checkbox > div { .form-group.checkbox > div {
position: relative; width: 60px; position: relative; width: 60px;
-webkit-user-select:none; -moz-user-select:none; -ms-user-select: none; -webkit-user-select:none; -moz-user-select:none; -ms-user-select: none;
display:inline-block; display:inline-block;
} }
.field.checkbox input { .form-group.checkbox input {
display: none; display: none;
} }
.field.checkbox > div label { .form-group.checkbox > div label {
display: block; overflow: hidden; cursor: pointer; display: block; overflow: hidden; cursor: pointer;
border: 1px solid #ccc; border: 1px solid #ccc;
border-radius: 4px; border-radius: 4px;
@ -1500,11 +1498,11 @@ dl.bb-dl > dd > li {
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
} }
.field.checkbox:hover label { .form-group.checkbox:hover label {
color: $link_colour; color: $link_colour;
} }
.field.checkbox:hover > div label { .form-group.checkbox:hover > div label {
border-color: $link_colour; border-color: $link_colour;
} }
@ -1543,11 +1541,11 @@ dl.bb-dl > dd > li {
-o-transition: all 0.3s ease-in 0s; transition: all 0.3s ease-in 0s; -o-transition: all 0.3s ease-in 0s; transition: all 0.3s ease-in 0s;
} }
.field.checkbox > div > input:checked + label .onoffswitch-inner { .form-group.checkbox > div > input:checked + label .onoffswitch-inner {
margin-left: 0px; margin-left: 0px;
} }
.field.checkbox > div > input:checked + label .onoffswitch-switch { .form-group.checkbox > div > input:checked + label .onoffswitch-switch {
right: 0px; right: 0px;
background-color: #0275d8; background-color: #0275d8;
} }

2
view/tpl/acl_selector.tpl
View File

@ -32,7 +32,7 @@
<div id="acl-wrapper"> <div id="acl-wrapper">
<div id="acl-list"> <div id="acl-list">
<input class="form-control" type="text" id="acl-search" placeholder="&#xf002; {{$search}}"> <input class="form-control" type="text" id="acl-search" placeholder="&#xf002; {{$search}}">
<div class="p-2 dropdown-sub-text">{{$showlimitedDesc}}</div> <small class="text-muted">{{$showlimitedDesc}}</small>
<div id="acl-list-content"></div> <div id="acl-list-content"></div>
</div> </div>
</div> </div>

8
view/tpl/cover_photo_widget.tpl
View File

@ -70,11 +70,7 @@
<div id="cover-photo" title="{{$hovertitle}}"> <div id="cover-photo" title="{{$hovertitle}}">
{{$photo_html}} {{$photo_html}}
<div id="cover-photo-caption"> <div id="cover-photo-caption">
<div class="cover-photo-title"> <h1>{{$title}}</h1>
{{$title}} <h3>{{$subtitle}}</h3>
</div>
<div class="cover-photo-subtitle">
{{$subtitle}}
</div>
</div> </div>
</div> </div>

7
view/tpl/field_checkbox.tpl
View File

@ -1,6 +1,5 @@
<div id="{{$field.0}}_container" class="form-group field checkbox"> <div id="{{$field.0}}_container" class="clearfix form-group checkbox">
<label for="id_{{$field.0}}">{{$field.1}}</label> <label for="id_{{$field.0}}">{{$field.1}}</label>
<div class="pull-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.5}}{{$field.5}}{{/if}} /><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div> <div class="float-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.5}}{{$field.5}}{{/if}} /><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div>
<span class="help-block">{{$field.3}}</span> <small class="form-text text-muted">{{$field.3}}</small>
</div> </div>
<div class="clear"></div>

9
view/tpl/field_input.tpl
View File

@ -1,6 +1,5 @@
<div id="id_{{$field.0}}_wrapper" class='form-group field input'> <div id="id_{{$field.0}}_wrapper" class="form-group">
<label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label> <label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
<input class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}> <input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="text" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>
<span id='help_{{$field.0}}' class='help-block'>{{$field.3}}</span> <small id="help_{{$field.0}}" class="form-text text-muted">{{$field.3}}</small>
<div class="clear"></div>
</div> </div>

9
view/tpl/field_intcheckbox.tpl
View File

@ -1,6 +1,5 @@
<div class="form-group field checkbox"> <div class="clearfix form-group checkbox">
<label for='id_{{$field.0}}'>{{$field.1}}</label> <label for="id_{{$field.0}}">{{$field.1}}</label>
<div class="pull-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3}}" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.5}}{{$field.5.1}}{{/if}}' data-off='{{if $field.5}}{{$field.5.0}}{{/if}}'></span><span class="onoffswitch-switch"></span> </label></div> <div class="pull-right"><input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.3}}" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for="id_{{$field.0}}"> <span class="onoffswitch-inner" data-on="{{if $field.5}}{{$field.5.1}}{{/if}}" data-off="{{if $field.5}}{{$field.5.0}}{{/if}}"></span><span class="onoffswitch-switch"></span> </label></div>
<span class='help-block'>{{$field.4}}</span> <small class="form-text text-muted">{{$field.4}}</small>
</div> </div>
<div class="clear"></div>

8
view/tpl/field_password.tpl
View File

@ -1,5 +1,5 @@
<div class='form-group field password'> <div class="form-group">
<label for='id_{{$field.0}}'>{{$field.1}}</label> <label for="id_{{$field.0}}">{{$field.1}}</label>
<input class="form-control" type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} <input class="form-control" type="password" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}}
<span id="help_{{$field.0}}" class="help-block">{{$field.3}}</span> <small id="help_{{$field.0}}" class="form-text text-muted">{{$field.3}}</small>
</div> </div>

8
view/tpl/field_select.tpl
View File

@ -1,7 +1,7 @@
<div class='form-group field select'> <div class="form-group">
<label for='id_{{$field.0}}'>{{$field.1}}</label> <label for="id_{{$field.0}}">{{$field.1}}</label>
<select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}'> <select class="form-control" name="{{$field.0}}" id="id_{{$field.0}}">
{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}} {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
</select> </select>
<span class='help-block'>{{$field.3}}</span> <small class="form-text text-muted">{{$field.3}}</small>
</div> </div>

8
view/tpl/field_textarea.tpl
View File

@ -1,5 +1,5 @@
<div class='form-group field textarea'> <div class="form-group">
<label for='id_{{$field.0}}'>{{$field.1}}</label> <label for="id_{{$field.0}}">{{$field.1}}</label>
<textarea class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea> <textarea class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea>
<span class='help-block'>{{$field.3}}</span> <small class="form-text text-muted">{{$field.3}}</small>
</div> </div>

4
view/tpl/field_yesno.tpl
View File

@ -1,4 +1,4 @@
<div class='field yesno'> <div class='clearfix form-group'>
<label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label>
<div class='onoff' id="id_{{$field.0}}_onoff"> <div class='onoff' id="id_{{$field.0}}_onoff">
<input type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"> <input type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
@ -9,5 +9,5 @@
{{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}} {{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}}
</a> </a>
</div> </div>
<span class='field_help'>{{$field.3}}</span> <small class='form-text text-muted'>{{$field.3}}</small>
</div> </div>

1
view/tpl/nav.tpl
View File

@ -206,6 +206,7 @@
{{$navapp|replace:'dropdown-item':'nav-link'}} {{$navapp|replace:'dropdown-item':'nav-link'}}
{{/foreach}} {{/foreach}}
{{if $localuser}} {{if $localuser}}
<div class="dropdown-divider"></div>
<a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a> <a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
{{/if}} {{/if}}
</div> </div>