Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Admin styles #12602

Merged
merged 8 commits into from
Nov 13, 2018
Merged

[FIX] Admin styles #12602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7e0fc3d
Updating admin style
engelgabriel Nov 13, 2018
445e787
Updating admin style
engelgabriel Nov 13, 2018
18a1f59
Updating admin style
engelgabriel Nov 13, 2018
54a8c1e
Updating admin style
engelgabriel Nov 13, 2018
4e595f1
Updating admin style
engelgabriel Nov 13, 2018
a7199e5
Updating admin style
engelgabriel Nov 13, 2018
dbb7b2d
Updating admin style
engelgabriel Nov 13, 2018
4037be8
Updating admin style
engelgabriel Nov 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/rocketchat-apps/client/admin/appLogs.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h2>
</h2>
{{/if}}
</header>
<div class="content background-transparent-dark">
<div class="content">
{{#if isReady}}
<div class="rocket-form">
{{#each log in logs}}
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-integrations/client/views/integrations.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{{/if}}
{{/header}}

<div class="content background-transparent-dark">
<div class="content">
{{#unless hasPermission}}
<p>{{_ "You_are_not_authorized_to_view_this_page"}}</p>
{{else}}
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-integrations/client/views/integrationsNew.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template name="integrationsNew">
<section class="page-container page-home page-static page-settings">
{{> header sectionName=pageTitle}}
<div class="content background-transparent-dark">
<div class="content">
<a href="{{pathFor "admin-integrations"}}"><i class="icon-angle-left"></i> {{_ "Back_to_integrations"}}</a><br><br>
{{#if hasPermission}}

Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-integrations/client/views/integrationsOutgoing.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</div>
{{/header}}

<div class="content background-transparent-dark">
<div class="content">
<a href="{{pathFor "admin-integrations"}}"><i class="icon-angle-left"></i> {{_ "Back_to_integrations"}}</a><br><br>
{{#unless hasPermission}}
<p>{{_ "You_are_not_authorized_to_view_this_page"}}</p>
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</div>
{{/header}}

<div class="content background-transparent-dark">
<div class="content">
{{#unless hasPermission}}
<p>{{_ "You_are_not_authorized_to_view_this_page"}}</p>
{{else}}
Expand Down
20 changes: 10 additions & 10 deletions packages/rocketchat-ui-admin/client/admin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{{/if}}
</div>
{{/header}}
<div class="content background-transparent-dark">
<div class="content">
{{#unless hasPermission 'view-privileged-setting'}}
<p>{{_ "You_are_not_authorized_to_view_this_page"}}</p>
{{else}}
Expand All @@ -34,7 +34,7 @@
{{translateSection section}}
</div>
<div class="section-title-right">
<button class="button primary expand"><span>{{_ "Expand"}}</span></button>
<button class="rc-button expand"><span>{{_ "Expand"}}</span></button>
</div>
</div>
{{/if}}
Expand Down Expand Up @@ -138,8 +138,8 @@
{{> CodeMirror name=_id options=getEditorOptions code=value }}
{{setEditorOnBlur _id}}
<div class="buttons">
<button class="button primary button-fullscreen">Full Screen</button>
<button class="button primary button-restore">Exit Full Screen</button>
<button class="rc-button rc-button--primary button-fullscreen">Full Screen</button>
<button class="rc-button rc-button--primary button-restore">Exit Full Screen</button>
</div>
</div>
{{/if}}
Expand All @@ -149,7 +149,7 @@
{{#if hasChanges section}}
<span style="line-height: 40px" class="secondary-font-color">{{_ "Save_to_enable_this_action"}}</span>
{{else}}
<button type="button" class="button primary action" data-setting="{{_id}}" data-action="{{value}}" {{isDisabled}} >{{_ actionText}}</button>
<button type="button" class="rc-button rc-button--primary action" data-setting="{{_id}}" data-action="{{value}}" {{isDisabled}} >{{_ actionText}}</button>
{{/if}}
{{/if}}

Expand All @@ -158,14 +158,14 @@
<div class="settings-file-preview">
<div class="preview" style="background-image:url({{value.url}}?_dc={{random}});"></div>
<div class="action">
<button type="button" class="button danger 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 secondary-font-color"></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="action">
<div class="button primary">{{_ 'Select_file'}}
<div class="rc-button rc-button--primary">{{_ 'Select_file'}}
<input type="file" accept="{{assetAccept fileConstraints}}" />
</div>
</div>
Expand All @@ -192,7 +192,7 @@
{{/if}}
</div>
{{#if showResetButton}}
<button text="{{_ 'Reset'}}" data-setting="{{_id}}" class="reset-setting button danger">
<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>
</button>
{{/if}}
Expand All @@ -203,7 +203,7 @@
<div class="input-line double-col">
<label class="setting-label">{{_ "Reset_section_settings"}}</label>
<div class="setting-field">
<button data-section="{{section}}" class="reset-group button danger">
<button data-section="{{section}}" class="reset-group rc-button rc-button--cancel">
{{_ "Reset"}}
</button>
</div>
Expand All @@ -213,7 +213,7 @@
{{#if section}}
{{#if sectionIsCustomOAuth section}}
<div class="submit">
<button class="button danger remove-custom-oauth"><span>{{_ "Remove_custom_oauth"}}</span></button>
<button class="rc-button rc-button--cancel remove-custom-oauth"><span>{{_ "Remove_custom_oauth"}}</span></button>
</div>
{{/if}}
{{/if}}
Expand Down
48 changes: 25 additions & 23 deletions packages/rocketchat_theme/client/imports/general/base_old.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@
& > div {
float: left;

width: 67%;
width: 70%;

& label {
display: inline-block;
Expand Down Expand Up @@ -1777,8 +1777,6 @@ rc-old select,

.rc-old .page-settings {
& .content {
padding: 20px 0;

& h2 {
margin-bottom: 2rem;
}
Expand All @@ -1798,12 +1796,9 @@ rc-old select,
}

& .section {
margin: 20px;
padding: 20px;
padding: 20px 0;

border: 1px solid #dddddd;
border-radius: 4px;
background-color: var(--color-white);
border-bottom: 2px solid #dddddd;

&.section-collapsed .section-content {
display: none;
Expand All @@ -1813,11 +1808,12 @@ rc-old select,
& .section-title {
display: flex;

font-size: 24px;
font-weight: 600;
line-height: 40px;

& .section-title-text {
font-size: 1rem;
font-weight: 500;

line-height: 3rem;

flex-grow: 1;
}

Expand All @@ -1836,9 +1832,8 @@ rc-old select,
display: flex;

margin-bottom: 0;
padding: 20px 0;
padding: 10px 0;

border-bottom: 1px solid #eeeeee;
align-items: flex-start;

&:last-child {
Expand All @@ -1865,13 +1860,12 @@ rc-old select,
}

& .setting-label {
width: 25%;
width: 30%;

text-align: left;

font-size: 16px;
font-weight: 500;
line-height: 20px;
line-height: 16px;
}

& .settings-description {
Expand Down Expand Up @@ -5383,19 +5377,29 @@ body:not(.is-cordova) {
text-align: right;
}

& .CodeMirror {
border-width: var(--input-border-width);
border-color: var(--input-border-color);
border-radius: var(--input-border-radius);
}

&.code-mirror-box-fullscreen {
position: fixed;
z-index: 100;
top: 61px;
right: 40px;
top: 0;
right: 0;
bottom: 0;
left: 260px;
left: 0;

display: flex;

flex-direction: column;

width: auto;
height: auto;

padding: 40px;

align-items: stretch;

& .buttons {
Expand All @@ -5405,10 +5409,8 @@ body:not(.is-cordova) {
& .title {
display: initial;

padding-left: 10px;

font-size: 16px;
line-height: 30px;
line-height: 50px;
}

& .button-fullscreen {
Expand Down
18 changes: 9 additions & 9 deletions tests/pageobjects/administration.page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ class Administration extends Page {
// settings
get buttonSave() { return browser.element('button.save'); }

get generalButtonExpandIframe() { return browser.element('.section:nth-of-type(4) .button.expand'); }
get generalButtonExpandNotifications() { return browser.element('.section:nth-of-type(5) .button.expand'); }
get generalButtonExpandRest() { return browser.element('.section:nth-of-type(6) .button.expand'); }
get generalButtonExpandReporting() { return browser.element('.section:nth-of-type(7) .button.expand'); }
get generalButtonExpandStreamCast() { return browser.element('.section:nth-of-type(8) .button.expand'); }
get generalButtonExpandTranslations() { return browser.element('.section:nth-of-type(9) .button.expand'); }
get generalButtonExpandUTF8() { return browser.element('.section:nth-of-type(10) .button.expand'); }
get generalButtonExpandIframe() { return browser.element('.section:nth-of-type(4) button.expand'); }
get generalButtonExpandNotifications() { return browser.element('.section:nth-of-type(5) button.expand'); }
get generalButtonExpandRest() { return browser.element('.section:nth-of-type(6) button.expand'); }
get generalButtonExpandReporting() { return browser.element('.section:nth-of-type(7) button.expand'); }
get generalButtonExpandStreamCast() { return browser.element('.section:nth-of-type(8) button.expand'); }
get generalButtonExpandTranslations() { return browser.element('.section:nth-of-type(9) button.expand'); }
get generalButtonExpandUTF8() { return browser.element('.section:nth-of-type(10) button.expand'); }

get generalSiteUrl() { return browser.element('[name="Site_Url"]'); }
get generalSiteUrlReset() { return browser.element('.reset-setting[data-setting="Site_Url"]'); }
Expand Down Expand Up @@ -123,8 +123,8 @@ class Administration extends Page {
get generalUTF8NamesSlugReset() { return browser.element('.reset-setting[data-setting="UTF8_Names_Slugify"]'); }

// accounts
get accountsButtonExpandDefaultUserPreferences() { return browser.element('.section:nth-of-type(2) .button.expand'); }
get accountsButtonCollapseDefaultUserPreferences() { return browser.element('.section:nth-of-type(2) .button.collapse'); }
get accountsButtonExpandDefaultUserPreferences() { return browser.element('.section:nth-of-type(2) button.expand'); }
get accountsButtonCollapseDefaultUserPreferences() { return browser.element('.section:nth-of-type(2) button.collapse'); }

get accountsEnableAutoAwayTrue() { return browser.element('label:nth-of-type(1) [name="Accounts_Default_User_Preferences_enableAutoAway"]'); }
get accountsEnableAutoAwayFalse() { return browser.element('label:nth-of-type(2) [name="Accounts_Default_User_Preferences_enableAutoAway"]'); }
Expand Down