This repository was archived by the owner on Sep 6, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 7.6k
[ARCH] Updated bootstrap to 2.3.1 and less to 1.3.3 (needed for bootstrap) #3996
Closed
Closed
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
ff8d55c
Updated bootstrap to 2.3.1 and less to 1.3.3 (needed for bootstrap)
WebsiteDeveloper 54394b0
Fixed Context Menu
WebsiteDeveloper 6c23c49
Three more migration fixes
WebsiteDeveloper de6c29d
Fixed a few UI issues and removed unused responsive files
WebsiteDeveloper b276e04
Fixed missed log statement
WebsiteDeveloper ceb6297
Fix scroller-shadow
WebsiteDeveloper c21ab02
Fix install extensions unit tests
WebsiteDeveloper b34eb06
Fixed find and JSLint UI
WebsiteDeveloper ceca9bc
Fixed modal layout issues
WebsiteDeveloper ad63c37
Fix for menu positioning
WebsiteDeveloper c58b5e6
Parsed LESS to CSS and load the css file
WebsiteDeveloper 026f9dd
Moved dropdown menu styles to fix recent projects UI
WebsiteDeveloper 9c6a57e
Added data-button-id to the dialog templates
WebsiteDeveloper 43d5435
Fixes for ContextMenus and Dialogs
WebsiteDeveloper c04cf47
Fixes after review
WebsiteDeveloper File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,6 +7,6 @@ <h1 class="dialog-title">{{EXTENSION_MANAGER_TITLE}}</h1> | |
<div class="modal-body no-padding zebra-striped"></div> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This |
||
<div class="modal-footer"> | ||
<button class="btn left install-from-url">{{INSTALL_FROM_URL}}</button> | ||
<button class="dialog-button btn primary" data-button-id="close">{{CLOSE}}</button> | ||
<button class="dialog-button btn primary" data-button-id="ok" data-dismiss="modal">{{CLOSE}}</button> | ||
</div> | ||
</div> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
// | ||
// Accordion | ||
// -------------------------------------------------- | ||
|
||
|
||
// Parent container | ||
.accordion { | ||
margin-bottom: @baseLineHeight; | ||
} | ||
|
||
// Group == heading + body | ||
.accordion-group { | ||
margin-bottom: 2px; | ||
border: 1px solid #e5e5e5; | ||
.border-radius(@baseBorderRadius); | ||
} | ||
.accordion-heading { | ||
border-bottom: 0; | ||
} | ||
.accordion-heading .accordion-toggle { | ||
display: block; | ||
padding: 8px 15px; | ||
} | ||
|
||
// General toggle styles | ||
.accordion-toggle { | ||
cursor: pointer; | ||
} | ||
|
||
// Inner needs the styles because you can't animate properly with any styles on the element | ||
.accordion-inner { | ||
padding: 9px 15px; | ||
border-top: 1px solid #e5e5e5; | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,79 @@ | ||
// | ||
// Alerts | ||
// -------------------------------------------------- | ||
|
||
|
||
// Base styles | ||
// ------------------------- | ||
|
||
.alert { | ||
padding: 8px 35px 8px 14px; | ||
margin-bottom: @baseLineHeight; | ||
text-shadow: 0 1px 0 rgba(255,255,255,.5); | ||
background-color: @warningBackground; | ||
border: 1px solid @warningBorder; | ||
.border-radius(@baseBorderRadius); | ||
} | ||
.alert, | ||
.alert h4 { | ||
// Specified for the h4 to prevent conflicts of changing @headingsColor | ||
color: @warningText; | ||
} | ||
.alert h4 { | ||
margin: 0; | ||
} | ||
|
||
// Adjust close link position | ||
.alert .close { | ||
position: relative; | ||
top: -2px; | ||
right: -21px; | ||
line-height: @baseLineHeight; | ||
} | ||
|
||
|
||
// Alternate styles | ||
// ------------------------- | ||
|
||
.alert-success { | ||
background-color: @successBackground; | ||
border-color: @successBorder; | ||
color: @successText; | ||
} | ||
.alert-success h4 { | ||
color: @successText; | ||
} | ||
.alert-danger, | ||
.alert-error { | ||
background-color: @errorBackground; | ||
border-color: @errorBorder; | ||
color: @errorText; | ||
} | ||
.alert-danger h4, | ||
.alert-error h4 { | ||
color: @errorText; | ||
} | ||
.alert-info { | ||
background-color: @infoBackground; | ||
border-color: @infoBorder; | ||
color: @infoText; | ||
} | ||
.alert-info h4 { | ||
color: @infoText; | ||
} | ||
|
||
|
||
// Block alerts | ||
// ------------------------- | ||
|
||
.alert-block { | ||
padding-top: 14px; | ||
padding-bottom: 14px; | ||
} | ||
.alert-block > p, | ||
.alert-block > ul { | ||
margin-bottom: 0; | ||
} | ||
.alert-block p + p { | ||
margin-top: 5px; | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,63 @@ | ||
/*! | ||
* Bootstrap v1.4.0 | ||
* Bootstrap v2.3.1 | ||
* | ||
* Copyright 2011 Twitter, Inc | ||
* Copyright 2012 Twitter, Inc | ||
* Licensed under the Apache License v2.0 | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Designed and built with all the love in the world @twitter by @mdo and @fat. | ||
* Date: Thu Jan 5 07:14:51 PST 2012 | ||
*/ | ||
|
||
// CSS Reset | ||
@import "reset.less"; | ||
|
||
// Core variables and mixins | ||
@import "variables.less"; // Modify this for custom colors, font-sizes, etc | ||
@import "mixins.less"; | ||
|
||
// CSS Reset | ||
@import "reset.less"; | ||
|
||
// Grid system and page structure | ||
@import "scaffolding.less"; | ||
@import "grid.less"; | ||
@import "layouts.less"; | ||
|
||
// Styled patterns and elements | ||
// Base CSS | ||
@import "type.less"; | ||
@import "code.less"; | ||
@import "forms.less"; | ||
@import "tables.less"; | ||
@import "patterns.less"; | ||
|
||
// Components: common | ||
@import "sprites.less"; | ||
@import "dropdowns.less"; | ||
@import "wells.less"; | ||
@import "component-animations.less"; | ||
@import "close.less"; | ||
|
||
// Components: Buttons & Alerts | ||
@import "buttons.less"; | ||
@import "button-groups.less"; | ||
@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less | ||
|
||
// Components: Nav | ||
@import "navs.less"; | ||
@import "navbar.less"; | ||
@import "breadcrumbs.less"; | ||
@import "pagination.less"; | ||
@import "pager.less"; | ||
|
||
// Components: Popovers | ||
@import "modals.less"; | ||
@import "tooltip.less"; | ||
@import "popovers.less"; | ||
|
||
// Components: Misc | ||
@import "thumbnails.less"; | ||
@import "media.less"; | ||
@import "labels-badges.less"; | ||
@import "progress-bars.less"; | ||
@import "accordion.less"; | ||
@import "carousel.less"; | ||
@import "hero-unit.less"; | ||
|
||
// Utility classes | ||
@import "utilities.less"; // Has to be last to override when necessary |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
// | ||
// Breadcrumbs | ||
// -------------------------------------------------- | ||
|
||
|
||
.breadcrumb { | ||
padding: 8px 15px; | ||
margin: 0 0 @baseLineHeight; | ||
list-style: none; | ||
background-color: #f5f5f5; | ||
.border-radius(@baseBorderRadius); | ||
> li { | ||
display: inline-block; | ||
.ie7-inline-block(); | ||
text-shadow: 0 1px 0 @white; | ||
> .divider { | ||
padding: 0 5px; | ||
color: #ccc; | ||
} | ||
} | ||
> .active { | ||
color: @grayLight; | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why was this changed from
.less
to.css
?ExtensionUtils.loadStyleSheet()
needs to support loading css or less files.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gruehle
ExtensionUtils.loadStyleSheet()
does support both css and less files (unless something broke).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
its actually not a problem with the function, but with the way less is interpreting the file path of certain urls.
Those urls weren't loaded properly because they did point to an nonexistent file after being processed bei less.
This seems due to a change in Less which changes the handling of relative urls.
I tried finding another workaround but didn't find one for now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, the url rewriting rules changed in less 1.3.2. Adding
rootpath: dir
to the options structure on line 88 ofExtentionUtils.js
solves the problem.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well thanks, didn't find that out will fix it when i push a bunch of fixes.