Dont load bootstrap buttons. Modified css with new buttons

2013-08-01 22:35:40 +03:00 · 2013-08-01 22:35:40 +03:00 · e834742407
commit e834742407
parent b8f6d67b96
34 changed files with 143 additions and 97 deletions
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@ -81,33 +81,6 @@ span.update-author {
  font-weight: normal;
 }

-form {
-  @extend .form-horizontal;
-
-  .actions {
-    @extend .form-actions;
-  }
-
-  .clearfix {
-    @extend .control-group;
-  }
-
-  .input {
-    @extend .controls;
-  }
-
-  label {
-    @extend .control-label;
-  }
-  .xlarge {
-    @extend .input-xlarge;
-  }
-  .xxlarge {
-    @extend .input-xxlarge;
-  }
-}
-
-
 .field_with_errors {
  display: inline;
 }
@ -127,13 +100,6 @@ ul.breadcrumb {
  }
 }

-input[type=text] {
-  &.large_text {
-    padding: 6px;
-    font-size: 16px;
-  }
-}
-
 .line_holder {
  &:hover {
    td {
--- a/app/assets/stylesheets/gitlab_bootstrap.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap.scss
@ -2,11 +2,49 @@
 $baseFontSize: 13px !default;
 $baseLineHeight: 18px !default;

-// BOOTSTRAP
-@import "bootstrap";
+/**
+ * BOOTSTRAP
+ */
+@import "bootstrap/variables";
+@import "bootstrap/mixins";
+@import "bootstrap/reset";
+@import "bootstrap/scaffolding";
+@import "bootstrap/grid";
+@import "bootstrap/layouts";
+@import "bootstrap/type";
+@import "bootstrap/code";
+@import "bootstrap/forms";
+@import "bootstrap/tables";
+@import "bootstrap/sprites";
+@import "bootstrap/dropdowns";
+@import "bootstrap/wells";
+@import "bootstrap/component-animations";
+@import "bootstrap/close";
+@import "bootstrap/button-groups";
+@import "bootstrap/alerts";
+@import "bootstrap/navs";
+@import "bootstrap/navbar";
+@import "bootstrap/breadcrumbs";
+@import "bootstrap/pagination";
+@import "bootstrap/pager";
+@import "bootstrap/modals";
+@import "bootstrap/tooltip";
+@import "bootstrap/popovers";
+@import "bootstrap/thumbnails";
+@import "bootstrap/media";
+@import "bootstrap/labels-badges";
+@import "bootstrap/progress-bars";
+@import "bootstrap/accordion";
+@import "bootstrap/carousel";
+@import "bootstrap/hero-unit";
+@import "bootstrap/utilities";
@import "bootstrap/responsive-utilities";
@import "bootstrap/responsive-1200px-min";

+/**
+ * Font icons
+ *
+ */
@import "font-awesome";

 /**
@ -26,3 +64,4 @@ $baseLineHeight: 18px !default;
@import "gitlab_bootstrap/files.scss";
@import "gitlab_bootstrap/tables.scss";
@import "gitlab_bootstrap/lists.scss";
+@import "gitlab_bootstrap/forms.scss";
--- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
@ -97,6 +97,8 @@

    .btn {
      vertical-align: middle;
+      padding: 4px 12px;
+      @include box-shadow(0 0px 1px 1px #f2f2f2);
    }

    .nav-pills {
--- a/app/assets/stylesheets/gitlab_bootstrap/common.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss
@ -90,3 +90,11 @@ pre.well-pre {
  border-radius: 0;
  color: #555;
 }
+
+.input-append .btn.active, .input-prepend .btn.active {
+  background: #CCC;
+  border-color: #BBB;
+  text-shadow: 0 1px 1px #fff;
+  font-weight: bold;
+  @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15));
+}
--- a/app/assets/stylesheets/gitlab_bootstrap/forms.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/forms.scss
@ -0,0 +1,32 @@
+form {
+  @extend .form-horizontal;
+
+  .actions {
+    @extend .form-actions;
+  }
+
+  .clearfix {
+    @extend .control-group;
+  }
+
+  .input {
+    @extend .controls;
+  }
+
+  label {
+    @extend .control-label;
+  }
+  .xlarge {
+    @extend .input-xlarge;
+  }
+  .xxlarge {
+    @extend .input-xxlarge;
+  }
+}
+
+input {
+  &.input-xpadding {
+    padding: 6px 10px;
+  }
+}
+
--- a/app/assets/stylesheets/gitlab_bootstrap/typography.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/typography.scss
@ -52,13 +52,6 @@ a {
    text-decoration: underline;
  }

-  &.btn {
-    color: $style_color;
-    &:hover {
-      color: $style_color;
-    }
-  }
-
  &.dark {
    color: $style_color;
  }
--- a/app/assets/stylesheets/sections/commits.scss
+++ b/app/assets/stylesheets/sections/commits.scss
@ -421,8 +421,8 @@

 .commits-compare-switch{
  background: url("switch_icon.png") no-repeat center center;
-  width: 16px;
-  height: 18px;
+  width: 22px;
+  height: 22px;
  text-indent: -9999px;
  float: left;
  margin-right: 9px;
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@ -7,11 +7,6 @@
      line-height: 20px;
      padding: 8px;
    }
-    .btn {
-      padding: 6px 10px;
-      margin-left: 10px;
-      margin-bottom: 8px;
-    }
  }
  .adv_settings {
    h6 { margin-left: 40px; }
@ -30,6 +25,10 @@
  padding: 4px 7px;
  border: 1px solid #CCC;
  margin-bottom: 20px;
+
+  .btn {
+    padding: 4px 12px;
+  }
 }

 .project_clone_holder {
@ -114,7 +113,7 @@ ul.nav.nav-projects-tabs {
 .public-clone {
  background: #333;
  color: #f5f5f5;
-  padding: 5px 10px;
+  padding: 6px 10px;
  margin: 1px;
  font-weight: normal;
 }
--- a/app/assets/stylesheets/sections/tree.scss
+++ b/app/assets/stylesheets/sections/tree.scss
@ -104,6 +104,8 @@
 }

 .tree-btn-group {
+  top: 2px;
+
  .btn {
    margin-right: 0px;
    padding: 2px 10px;
--- a/app/views/admin/groups/index.html.haml
+++ b/app/views/admin/groups/index.html.haml
@ -4,7 +4,7 @@
    allows you to keep projects organized.
    Use groups for uniting related projects.

-  = link_to 'New Group', new_admin_group_path, class: "btn btn-small pull-right"
+  = link_to 'New Group', new_admin_group_path, class: "btn btn-new pull-right"
 %br
 = form_tag admin_groups_path, method: :get, class: 'form-inline' do
  = text_field_tag :name, params[:name], class: "span6"
--- a/app/views/admin/hooks/index.html.haml
+++ b/app/views/admin/hooks/index.html.haml
@ -13,7 +13,7 @@
  .clearfix
    = f.label :url, "URL:"
    .input
-      = f.text_field :url, class: "text_field xxlarge"
+      = f.text_field :url, class: "text_field xxlarge input-xpadding"
      &nbsp;
      = f.submit "Add System Hook", class: "btn btn-create"
 %hr
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@ -38,7 +38,7 @@
      .title
        Projects (#{@projects.total_count})
        .pull-right
-          = link_to 'New Project', new_project_path, class: "btn btn-small btn-primary wide"
+          = link_to 'New Project', new_project_path, class: "btn btn-new"
      %ul.well-list
        - @projects.each do |project|
          %li
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@ -30,7 +30,7 @@
      .title
        Users (#{@users.total_count})
        .pull-right
-          = link_to 'New User', new_admin_user_path, class: "btn btn-small wide btn-primary"
+          = link_to 'New User', new_admin_user_path, class: "btn btn-new"
      %ul.well-list
        - @users.each do |user|
          %li
--- a/app/views/profiles/groups/index.html.haml
+++ b/app/views/profiles/groups/index.html.haml
@ -1,5 +1,10 @@
 %h3.page-title
  Group membership
+  - if current_user.can_create_group?
+    %span.pull-right
+      = link_to new_group_path, class: "btn btn-new" do
+        %i.icon-plus
+        New Group
 %p.light
  Members of group have access to all group projects.
 %hr
@ -7,11 +12,6 @@
  .title
    %strong Groups
    (#{@groups.count})
-    - if current_user.can_create_group?
-      %span.pull-right
-        = link_to new_group_path, class: "btn btn-small btn-primary" do
-          %i.icon-plus
-          New Group
  %ul.well-list
    - @groups.each do |group|
      %li
--- a/app/views/profiles/keys/index.html.haml
+++ b/app/views/profiles/keys/index.html.haml
@ -1,5 +1,7 @@
 %h3.page-title
  My SSH keys
+  .pull-right
+    = link_to "Add SSH Key", new_profile_key_path, class: "btn btn-new"
 %p.light
  SSH key allows you to establish a secure connection between your computer and GitLab
  %br
@ -11,8 +13,6 @@
 .ui-box
  .title
    SSH Keys (#{@keys.count})
-    .pull-right
-      = link_to "Add SSH Key", new_profile_key_path, class: "btn btn-small btn-primary"
  %ul.well-list#keys-table
    = render @keys
    - if @keys.blank?
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@ -87,4 +87,4 @@
          = link_to "Add Public Key", new_profile_key_path, class: "btn btn-small"

  .form-actions
-    = f.submit 'Save', class: "btn btn-save"
+    = f.submit 'Save changes', class: "btn btn-save"
--- a/app/views/projects/blob/_actions.html.haml
+++ b/app/views/projects/blob/_actions.html.haml
@ -1,12 +1,12 @@
 .btn-group.tree-btn-group
  -# only show edit link for text files
  - if @blob.text?
-    = link_to "edit", project_edit_tree_path(@project, @id), class: "btn btn-tiny", disabled: !allowed_tree_edit?
-  = link_to "raw", project_raw_path(@project, @id), class: "btn btn-tiny", target: "_blank"
+    = link_to "edit", project_edit_tree_path(@project, @id), class: "btn btn-small", disabled: !allowed_tree_edit?
+  = link_to "raw", project_raw_path(@project, @id), class: "btn btn-small", target: "_blank"
  -# only show normal/blame view links for text files
  - if @blob.text?
    - if current_page? project_blame_path(@project, @id)
-      = link_to "normal view", project_blob_path(@project, @id), class: "btn btn-tiny"
+      = link_to "normal view", project_blob_path(@project, @id), class: "btn btn-small"
    - else
-      = link_to "blame", project_blame_path(@project, @id), class: "btn btn-tiny" unless @blob.empty?
-  = link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny"
+      = link_to "blame", project_blame_path(@project, @id), class: "btn btn-small" unless @blob.empty?
+  = link_to "history", project_commits_path(@project, @id), class: "btn btn-small"
--- a/app/views/projects/compare/_form.html.haml
+++ b/app/views/projects/compare/_form.html.haml
@ -14,9 +14,9 @@
      .pull-left
        - if params[:to] && params[:from]
          = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'}
-        = text_field_tag :from, params[:from], placeholder: "master", class: "xlarge"
+        = text_field_tag :from, params[:from], placeholder: "master", class: "xlarge input-xpadding"
        = "..."
-        = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge"
+        = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge input-xpadding"
      .pull-left
        &nbsp;
        = submit_tag "Compare", class: "btn btn-create commits-compare-btn"
--- a/app/views/projects/deploy_keys/index.html.haml
+++ b/app/views/projects/deploy_keys/index.html.haml
@ -1,12 +1,14 @@
 %p.slead
-  Deploy keys allow read-only access to repository. They can be used for CI, staging or production servers
+  Deploy keys allow read-only access to repository

-%p
-  You can create a deploy key or add existing one
-  = link_to new_project_deploy_key_path(@project), class: "btn btn-primary pull-right", title: "New Deploy Key" do
+  = link_to new_project_deploy_key_path(@project), class: "btn btn-new pull-right", title: "New Deploy Key" do
    %i.icon-plus
    New Deploy Key

+%p.light
+  They can be used for CI, staging or production servers.
+  You can create a deploy key or add existing one
+
 %hr.clearfix

 .row
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@ -4,7 +4,7 @@
    .ui-box.white
      .title
        %strong= @project.name
-        Project Settings:
+        project settings:
      .form-holder
        = form_for(@project, remote: true) do |f|
          %fieldset
@ -98,7 +98,7 @@


          .form-actions
-            = f.submit 'Save', class: "btn btn-save"
+            = f.submit 'Save changes', class: "btn btn-save"

    - if can?(current_user, :change_namespace, @project)
      .ui-box.ui-box-danger
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
@ -14,7 +14,7 @@
  .clearfix
    = f.label :url, "URL:"
    .input
-      = f.text_field :url, class: "text_field xxlarge"
+      = f.text_field :url, class: "text_field xxlarge input-xpadding", placeholder: 'http://example.com/trigger-ci.json'
      &nbsp;
      = f.submit "Add Web Hook", class: "btn btn-create"
 %hr
--- a/app/views/projects/issues/index.html.haml
+++ b/app/views/projects/issues/index.html.haml
@ -6,7 +6,7 @@
    .pull-right
      .span6
        - if can? current_user, :write_issue, @project
-          = link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-primary pull-right", title: "New Issue", id: "new_issue_link" do
+          = link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-new pull-right", title: "New Issue", id: "new_issue_link" do
            %i.icon-plus
            New Issue
        = form_tag project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: 'pull-right'  do
@ -14,7 +14,7 @@
          = hidden_field_tag :assignee_id, params[:assignee_id], id: 'search_assignee_id'
          = hidden_field_tag :milestone_id, params[:milestone_id], id: 'search_milestone_id'
          = hidden_field_tag :label_name, params[:label_name], id: 'search_label_name'
-          = search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search input-xlarge append-right-10 search-text-input' }
+          = search_field_tag :issue_search, nil, { placeholder: 'Filter by title or description', class: 'input-xpadding issue_search input-xlarge append-right-10 search-text-input' }

 .row
  .span3
--- a/app/views/projects/merge_requests/index.html.haml
+++ b/app/views/projects/merge_requests/index.html.haml
@ -1,5 +1,5 @@
 - if can? current_user, :write_merge_request, @project
-  = link_to new_project_merge_request_path(@project), class: "pull-right btn btn-primary", title: "New Merge Request" do
+  = link_to new_project_merge_request_path(@project), class: "pull-right btn btn-new", title: "New Merge Request" do
    %i.icon-plus
    New Merge Request
 %h3.page-title
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
@ -32,7 +32,7 @@

  .form-actions
    - if @milestone.new_record?
-      = f.submit 'Create milestone', class: "btn-save btn"
+      = f.submit 'Create milestone', class: "btn-create btn"
      = link_to "Cancel", project_milestones_path(@project), class: "btn btn-cancel"
    -else
      = f.submit 'Save changes', class: "btn-save btn"
--- a/app/views/projects/milestones/index.html.haml
+++ b/app/views/projects/milestones/index.html.haml
@ -3,7 +3,7 @@
  %h3.page-title
    Milestones
    - if can? current_user, :admin_milestone, @project
-      = link_to new_project_milestone_path(@project), class: "pull-right btn btn-primary", title: "New Milestone" do
+      = link_to new_project_milestone_path(@project), class: "pull-right btn btn-new", title: "New Milestone" do
        %i.icon-plus
        New Milestone

--- a/app/views/projects/team_members/index.html.haml
+++ b/app/views/projects/team_members/index.html.haml
@ -3,9 +3,9 @@

  - if can? current_user, :admin_team_member, @project
    %span.pull-right
-      = link_to import_project_team_members_path(@project), class: "btn btn-small grouped", title: "Import team from another project" do
+      = link_to import_project_team_members_path(@project), class: "btn grouped", title: "Import team from another project" do
        Import team from another project
-      = link_to new_project_team_member_path(@project), class: "btn btn-primary small grouped", title: "New Team Member" do
+      = link_to new_project_team_member_path(@project), class: "btn btn-new grouped", title: "New Team Member" do
        New Team Member

 %p.light
--- a/app/views/projects/wikis/_form.html.haml
+++ b/app/views/projects/wikis/_form.html.haml
@ -29,8 +29,9 @@
      = f.label :commit_message
      .input= f.text_field :message, class: 'span8'
  .actions
-    = f.submit 'Save', class: "btn-save btn"
    - if @wiki && @wiki.persisted?
+      = f.submit 'Save changes', class: "btn-save btn"
      = link_to "Cancel", project_wiki_path(@project, @wiki), class: "btn btn-cancel"
    - else
+      = f.submit 'Create page', class: "btn-create btn"
      = link_to "Cancel", project_wiki_path(@project, :home), class: "btn btn-cancel"
--- a/app/views/projects/wikis/_nav.html.haml
+++ b/app/views/projects/wikis/_nav.html.haml
@ -12,7 +12,7 @@

  - if can?(current_user, :write_wiki, @project)
    .pull-right
-      = link_to '#', class: "add-new-wiki btn btn-small btn-primary" do
+      = link_to '#', class: "add-new-wiki btn btn-new" do
        %i.icon-plus
        New Page

--- a/app/views/projects/wikis/git_access.html.haml
+++ b/app/views/projects/wikis/git_access.html.haml
@ -1,10 +1,9 @@
 = render 'nav'
 %h3.page-title
-  Git Access
+  Git access for
  %strong= @gollum_wiki.path_with_namespace
  = render 'main_links'

-%br
 .content
  .project_clone_panel
    .row
--- a/app/views/snippets/current_user_index.html.haml
+++ b/app/views/snippets/current_user_index.html.haml
@ -1,12 +1,13 @@
 %h3.page-title
  My Snippets
-  %small share code pastes with others out of git repository
  .pull-right
-    = link_to new_snippet_path, class: "btn btn-small add_new grouped btn-primary", title: "New Snippet" do
+    = link_to new_snippet_path, class: "btn btn-new grouped", title: "New Snippet" do
      Add new snippet
-    = link_to snippets_path, class: "btn btn-small grouped"  do
+    = link_to snippets_path, class: "btn grouped"  do
      Discover snippets

+%p.light
+  Share code pastes with others out of git repository
 %hr

 .row
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@ -1,13 +1,15 @@
 %h3.page-title
  Public snippets
-  %small share code pastes with others out of git repository

  .pull-right
-    = link_to new_snippet_path, class: "btn btn-small add_new grouped btn-primary", title: "New Snippet" do
+    = link_to new_snippet_path, class: "btn btn-new grouped", title: "New Snippet" do
      Add new snippet
-    = link_to user_snippets_path(current_user), class: "btn btn-small grouped"  do
+    = link_to user_snippets_path(current_user), class: "btn grouped"  do
      My snippets

+%p.light
+  Public snippets created by you and other users are listed here
+
 %hr
 = render 'snippets'

--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@ -7,7 +7,7 @@
      private

  .pull-right
-    = link_to new_snippet_path, class: "btn btn-small add_new grouped btn-primary", title: "New Snippet" do
+    = link_to new_snippet_path, class: "btn btn-new btn-small", title: "New Snippet" do
      Add new snippet


--- a/features/steps/profile/profile.rb
+++ b/features/steps/profile/profile.rb
@ -12,7 +12,7 @@ class Profile < Spinach::FeatureSteps
    fill_in "user_skype", with: "testskype"
    fill_in "user_linkedin", with: "testlinkedin"
    fill_in "user_twitter", with: "testtwitter"
-    click_button "Save"
+    click_button "Save changes"
    @user.reload
  end

--- a/features/steps/project/project.rb
+++ b/features/steps/project/project.rb
@ -9,7 +9,7 @@ class ProjectFeature < Spinach::FeatureSteps
  end

  And 'I save project' do
-    click_button 'Save'
+    click_button 'Save changes'
  end

  Then 'I should see project with new settings' do