Skip to content
Snippets Groups Projects

WIP UI framework

Closed username-removed-444 requested to merge ui-dev-kit into master

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
18 18
19 19 @mixin btn-middle {
20 20 @include btn-default;
21 @include border-radius(2px);
21 @include border-radius(3px);
22 22 padding: 11px 24px;
23 23 }
24 24
25 25 @mixin btn-color($light, $border-light, $normal, $border-normal, $dark, $border-dark, $color) {
26 26 background-color: $light;
27 background-image: linear-gradient(#fff, $gray-light);
  • Added 1 commit:

  • Added 1 commit:

  • Added 1 commit:

  • Added 1 commit:

  • Added 2 commits:

  • Added 1 commit:

  • Added 1 commit:

  • Added 1 commit:

  • Added 1 commit:

  • Added 1 commit:

  • Added 1 commit:

  • Added 635 commits:

  • Added 1 commit:

  • Added 1 commit:

  • @skyruler this merge request is open for 14 days. Its too much. Please prepare it to some ready state tomorrow so I can merge it. Next time changes should be split in smaller parts and submitted as separate merge requests.

  • @skyruler For example this could be few different merge requests:

    • new buttons merge request
    • base color changes
    • typography changes
    Edited by username-removed-444
  • @skyruler also please address my comments when preparing this merge request

  • 1 1 @mixin btn-default {
    2 @include border-radius(2px);
    2 @include border-radius(3px);
    3 3 border-width: 1px;
    4 4 border-style: solid;
    5 text-transform: uppercase;
    6 font-size: 13px;
    7 font-weight: 600;
    5 font-size: 15px;
    6 font-weight: 500;
    8 7 line-height: 18px;
    9 padding: 11px $gl-padding;
    8 padding: 7px $gl-padding;
    • we use same padding for buttons and text fields. After this change it no longer fit each other. It might be a problem for Dashboard page where we have input field and button together

  • 21 21 - if can?(current_user, :admin_project, @project)
    22 22 = link_to edit_project_path(@project), class: 'btn btn-gray' do
    23 23 = icon('pencil')
    24 - if current_user
    25  
    26 = link_to namespace_project_path(@project.namespace, @project, format: :atom, private_token: current_user.private_token), class: 'btn btn-gray' do
    27 = icon('rss')
    28
  • Added 1 commit:

  • username-removed-444 Milestone changed to 8.4

    Milestone changed to 8.4

  • Added 61 commits:

  • @skyruler I am closing this one since its not going to be merged anyway. We split it on smaller requests

  • username-removed-444 Status changed to closed

    Status changed to closed

  • Jacob Schatz mentioned in commit 33a483e7

    mentioned in commit 33a483e7

  • Please register or sign in to reply
    Loading