Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • B bootstrap
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 263
    • Issues 263
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 114
    • Merge requests 114
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • Bootstrap
  • bootstrap
  • Merge requests
  • !698

FIX: @primaryButton and Sidebar Variable Updates

  • Review changes

  • Download
  • Email patches
  • Plain diff
Closed Administrator requested to merge github/fork/jackieshaffer/2.0-wip into 2.0-wip 13 years ago
  • Overview 0
  • Commits 3
  • Pipelines 0
  • Changes 3

Created by: jackieshaffer

Currently there is only a dummy @primaryButtonColor variable in variables.less, however it is not called from patterns.less. This updates patterns.less to pull from primaryButton Variable color

Sidebar width is currently statically set at 240px; Added a new variable @sidebarWidth; to allow user to specify sidebar width; Scaffolding.less has been updated to use @gridGutterWidth variable instead of the 20px static.

I also wanted to make sure the width of the sidebar stayed true to the width set by the variable So the content div will contract for padding/gutters and not the sidebar (as it is currently set to).

For example, if you set your sidebar width to 300px and place a 300px wide ad in the sidebar, I wanted to make sure the sidebar inner width was actually 300px and not 280px, which it will do now.

Compare
  • 2.0-wip (base)

and
  • latest version
    9cdb254a
    3 commits, 2 years ago

3 files
+ 7
- 6

    Preferences

    File browser
    Compare changes
l‎ib‎
patter‎ns.less‎ +1 -1
scaffold‎ing.less‎ +5 -5
variabl‎es.less‎ +1 -0
lib/patterns.less
+ 1
- 1
  • View file @ 9cdb254a


@@ -408,7 +408,7 @@ footer {
// Primary Button Type
&.primary {
color: @white;
.gradientBar(@blue, @blueDark)
.gradientBar(@primaryButtonColor, darken(@primaryButtonColor, 10%))
}
// Transitions
lib/scaffolding.less
+ 5
- 5
  • View file @ 9cdb254a


@@ -25,25 +25,25 @@ body {
.fluid-container {
position: relative;
min-width: 940px;
padding-left: 20px;
padding-right: 20px;
padding-left: @gridGutterWidth;
padding-right: @gridGutterWidth;
.clearfix();
}
// Sidebars (left and right options)
.fluid-sidebar-left,
.fluid-sidebar-right {
width: 220px;
width: @sidebarWidth;
}
.fluid-sidebar-left { float: left; }
.fluid-sidebar-right { float: right; }
// The main content area
.fluid-content {
margin-left: 240px;
margin-left: @sidebarWidth;
}
// Reverse layout for sidebar on right
.fluid-container.reverse .fluid-content {
margin-left: 0;
margin-right: 240px;
margin-right: (@sidebarWidth + @gridGutterWidth);
}
lib/variables.less
+ 1
- 0
  • View file @ 9cdb254a


@@ -42,6 +42,7 @@
@gridColumnWidth: 60px;
@gridGutterWidth: 20px;
@siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
@sidebarWidth: 240px;
// THEME VARIABLES
0 Assignees
None
Assign to
0 Reviewers
None
Request review from
Labels
0
None
0
None
    Assign labels
  • Manage project labels

Milestone
No milestone
None
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
1
1 participant
Administrator
Reference: twbs/bootstrap!698
Source branch: github/fork/jackieshaffer/2.0-wip

Menu

Explore Projects Groups Snippets