apitech
/
Rocket.Chat
mirror of https://github.com/RocketChat/Rocket.Chat
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[FIX] Admin styles (#12614)

Browse Source
pull/12618/head^2
Gabriel Engel 7 years ago committed by GitHub
parent 4306eb48ab
commit b42ffa874a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 49 additions and 52 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      packages/rocketchat-ui-admin/client/admin.html
  2. 4
      packages/rocketchat-ui-admin/client/admin.js
  3. 1
      packages/rocketchat_theme/client/imports/forms/button.css
  4. 13
      packages/rocketchat_theme/client/imports/forms/input.css
  5. 17
      packages/rocketchat_theme/client/imports/forms/select.css
  6. 52
      packages/rocketchat_theme/client/imports/general/base_old.css

14
packages/rocketchat-ui-admin/client/admin.html
Unescape View File

@ -34,7 +34,7 @@
{{translateSection section}}
</div>
<div class="section-title-right">
<button class="rc-button expand"><span>{{_ "Expand"}}</span></button>
<button class="rc-button rc-button--nude expand"><i class="icon-angle-down"></i></button>
</div>
</div>
{{/if}}
@ -158,12 +158,12 @@
<div class="settings-file-preview">
<div class="preview" style="background-image:url({{value.url}}?_dc={{random}});"></div>
<div class="action">
<button type="button" class="rc-button rc-button--cancel delete-asset"><i class="icon-trash secondary-font-color"></i>{{_ 'Delete'}}</button>
<button type="button" class="rc-button rc-button--cancel delete-asset"><i class="icon-trash"></i>{{_ 'Delete'}}</button>
</div>
</div>
{{else}}
<div class="settings-file-preview">
<div class="preview no-file background-transparent-light secondary-font-color"><i class="icon-upload secondary-font-color"></i></div>
<div class="preview no-file background-transparent-light secondary-font-color"><i class="icon-upload"></i></div>
<div class="action">
<div class="rc-button rc-button--primary">{{_ 'Select_file'}}
<input type="file" accept="{{assetAccept fileConstraints}}" />
@ -178,22 +178,22 @@
{{> inputAutocomplete settings=autocompleteRoom id=_id name=_id class="search autocomplete rc-input__element" autocomplete="off" disabled=isDisabled.disabled}}
<ul class="selected-rooms">
{{#each selectedRooms}}
<li class="remove-room" data-setting={{../_id}}>{{name}} <i class="icon-cancel secondary-font-color"></i></li>
<li class="remove-room" data-setting={{../_id}}>{{name}} <i class="icon-cancel"></i></li>
{{/each}}
</ul>
</div>
{{/if}}
{{#if description}}
<div class="settings-description">{{{RocketChatMarkdownUnescape description}}}</div>
<div class="settings-description secondary-font-color">{{{RocketChatMarkdownUnescape description}}}</div>
{{/if}}
{{#if alert}}
<div class="settings-alert pending-color pending-background pending-border"><i class="icon-attention secondary-font-color"></i>{{{_ alert}}}</div>
<div class="settings-alert pending-color pending-background pending-border"><i class="icon-attention"></i>{{{_ alert}}}</div>
{{/if}}
</div>
{{#if showResetButton}}
<button text="{{_ 'Reset'}}" data-setting="{{_id}}" class="reset-setting rc-button rc-button--cancel">
<i class="icon-ccw secondary-font-color color-error-contrast"></i>
<i class="icon-ccw color-error-contrast"></i>
</button>
{{/if}}
</div>

4
packages/rocketchat-ui-admin/client/admin.js
Unescape View File

@ -528,14 +528,14 @@ Template.admin.events({
},
'click .expand'(e) {
$(e.currentTarget).closest('.section').removeClass('section-collapsed');
$(e.currentTarget).closest('button').removeClass('expand').addClass('collapse').find('span').text(TAPi18n.__('Collapse'));
$(e.currentTarget).closest('button').attr('title', TAPi18n.__('Collapse')).removeClass('expand').addClass('collapse').find('i').attr('class', 'icon-angle-up');
$('.CodeMirror').each(function(index, codeMirror) {
codeMirror.CodeMirror.refresh();
});
},
'click .collapse'(e) {
$(e.currentTarget).closest('.section').addClass('section-collapsed');
$(e.currentTarget).closest('button').addClass('expand').removeClass('collapse').find('span').text(TAPi18n.__('Expand'));
$(e.currentTarget).closest('button').attr('title', TAPi18n.__('Expand')).addClass('expand').removeClass('collapse').find('i').attr('class', 'icon-angle-down');
},
'click button.action'() {
if (this.type !== 'action') {

1
packages/rocketchat_theme/client/imports/forms/button.css
Unescape View File

@ -18,7 +18,6 @@
min-height: 40px;
max-height: 40px;
margin: 0.5rem 0;
padding: 0 1.5rem;
cursor: pointer;

13
packages/rocketchat_theme/client/imports/forms/input.css
Unescape View File

@ -34,11 +34,7 @@
justify-content: center;
& + .rc-input__element {
padding: 0.75rem 1rem 0.75rem 2.75rem;
}
& + .rc-input__element--small {
padding: 0.5rem 1rem 0.5rem 2.75rem;
padding: 0 1rem 0 2.75rem;
}
&--right {
@ -49,7 +45,7 @@
&__element {
width: 100%;
padding: 0.75rem 1rem;
padding: 0 1rem;
color: var(--input-text-color);
@ -60,8 +56,10 @@
font-size: var(--input-font-size);
line-height: 2.25rem;
&--small {
padding: 0.5rem 1rem;
line-height: 1.75rem;
}
&::placeholder {
@ -206,7 +204,6 @@
select.rc-input {
width: 100%;
margin: 0.5rem 0;
padding: 0.782rem;
color: var(--input-text-color);

17
packages/rocketchat_theme/client/imports/forms/select.css
Unescape View File

@ -6,7 +6,7 @@
flex: 0 0 auto;
margin: 0.5rem 0;
height: 2.5rem;
color: var(--input-text-color);
@ -37,26 +37,29 @@
&__element {
width: 100%;
padding: 0.75rem 2rem 0.75rem 1rem;
height: 100%;
padding: 0 2rem 0 1rem;
text-transform: capitalize;
border: none;
border-radius: 0;
line-height: 1rem !important;
font-size: inherit;
appearance: none;
&::-ms-expand {
display: none;
}
}
.rc-select__small & {
padding: 0.5rem 1rem;
}
&--small {
height: 1.75rem;
}
}
.rtl .rc-select__element {
padding: 0.75rem 1rem 0.75rem 2rem;
padding: 0 1rem 0 2rem;
}

52
packages/rocketchat_theme/client/imports/general/base_old.css
Unescape View File

@ -357,7 +357,6 @@
&.double-col {
& > label {
float: left;
width: 30%;
margin-bottom: 0;
@ -369,16 +368,16 @@
}
& > div {
float: left;
width: 70%;
width: 60%;
min-height: 2.5rem;
& label {
display: inline-block;
margin-right: 4px;
line-height: 35px;
line-height: 2.5rem;
&:nth-last-child(1) {
margin-right: 0;
@ -394,15 +393,6 @@
/* input & form styles */
.rc-old input,
.rc-old button,
.rc-old select,
.rc-old textarea {
font-family: inherit;
font-size: inherit;
line-height: inherit;
}
.rc-old input:focus {
outline: none;
box-shadow: 0 0 0;
@ -1817,13 +1807,13 @@ rc-old select,
flex-grow: 1;
}
& .section-title-right {
line-height: 0;
& .section-title-right > .rc-button {
font-size: 1.25rem;
}
}
& .section-content {
padding: 20px 0 0 !important;
padding: 20px 0 !important;
border: none !important;
border-radius: 0 !important;
@ -1856,13 +1846,12 @@ rc-old select,
}
& .reset-setting {
margin-left: 20px;
margin-left: 0.75rem;
padding: 0.75rem;
}
& .setting-label {
width: 30%;
text-align: left;
min-width: 30%;
font-weight: 500;
line-height: 16px;
@ -1871,15 +1860,19 @@ rc-old select,
& .settings-description {
padding: 5px;
line-height: 20px;
line-height: 1.2rem;
}
& .settings-alert {
padding: 5px;
border-width: 1px;
margin-top: 0.75rem;
padding: 1rem;
border-width: 2px;
font-weight: bold;
line-height: 1.2rem;
}
& .color-editor {
@ -1929,18 +1922,21 @@ rc-old select,
overflow: hidden;
width: 100px;
height: 50px;
height: 40px;
margin-right: 0.75rem;
border-width: var(--input-border-width);
border-color: var(--input-border-color);
border-radius: var(--input-border-radius);
border-radius: 4px;
background-repeat: no-repeat;
background-position: center center;
background-size: contain;
box-shadow: 0 0 1px rgba(0, 0, 0, 0.5) inset;
&.no-file {
display: flex;
font-size: 24px;
align-items: center;
justify-content: center;
}
@ -3076,6 +3072,8 @@ rc-old select,
margin-right: 5px;
font-size: inherit;
font-weight: 600;
}

Write Preview
Loading…
Cancel
Save