fix button variables

pull/7748/head
Karl Prieb 8 years ago
parent 62825ee035
commit b7a527b6ad
  1. 16
      packages/rocketchat-theme/client/imports/forms/button.css
  2. 19
      packages/rocketchat-theme/client/imports/general/variables.css
  3. 2
      packages/rocketchat-ui-account/client/accountProfile.html
  4. 2
      packages/rocketchat-ui/client/views/app/createChannel.html

@ -4,25 +4,25 @@
cursor: pointer;
transition: background-color 0.3s;
border-width: 1px;
border-width: var(--button-border-width);
border-style: solid;
border-radius: 2px;
border-radius: var(--button-border-radius);
background-color: transparent;
font-size: var(--input-font-size);
font-size: var(--button-text-size);
&:disabled {
cursor: default;
color: var(--color-white);
color: var(--button-disabled-text-color);
border: 0;
background-color: var(--color-gray-light);
background-color: var(--button-disabled-background);
}
&--blue {
color: var(--color-white);
&--primary {
color: var(--button-primary-text-color);
border: 0;
background-color: var(--color-button-primary);
background-color: var(--button-primary-background);
}
&--small {

@ -42,12 +42,27 @@
/*
* Forms
*/
--gap-between-elements: 2.5rem;
--label-margin-bottom: 1rem;
/*
* Forms - Button
*/
--button-square-size: 36px;
--button-padding: 0.782rem;
--button-padding-small: 0.5rem;
--button-text-size: var(--input-font-size);
--button-border-width: var(--border);
--button-border-radius: var(--border-radius);
--button-disabled-background: var(--color-gray-light);
--button-disabled-text-color: var(--color-white);
--button-primary-background: var(--color-button-primary);
--button-primary-text-color: var(--color-white);
/*
* Forms - Input
*/
--input-font-size: 0.875rem;
--gap-between-elements: 2.5rem;
--label-margin-bottom: 1rem;
--input-title-text-size: var(--input-font-size);
--input-title-color: #2d343d;
--input-text-color: var(--color-dark-medium);

@ -18,7 +18,7 @@
{{> burger}}
<h2 style="flex: 1 1; white-space: nowrap;">{{_ "My Profile"}}</h2>
<div class="content" style="text-align: end; max-width: 649px; flex: 1 1 100%">
<button class="rc-button rc-button--blue" name="send" type="submit" data-button="create" form="profile" {{canSave 'disabled'}}>Save Changes</button>
<button class="rc-button rc-button--primary" name="send" type="submit" data-button="create" form="profile" {{canSave 'disabled'}}>Save Changes</button>
</div>
<div style="flex: 1 1;"></div>
</header>

@ -84,7 +84,7 @@
</label>
</div>
</div>
<button class="rc-button rc-button--blue" type='submit' data-button="create" {{createIsDisabled}}>{{_ "Create"}}</button>
<button class="rc-button rc-button--primary" type='submit' data-button="create" {{createIsDisabled}}>{{_ "Create"}}</button>
</form>
</section>
</template>

Loading…
Cancel
Save