Merge ~twom/launchpad:sassy-css-more-consistent-skins into launchpad:master

Proposed by Tom Wardill
Status: Merged
Approved by: Tom Wardill
Approved revision: b3633ba2e9cf1948929d07958712ca2cc2b15a69
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~twom/launchpad:sassy-css-more-consistent-skins
Merge into: launchpad:master
Diff against target: 14 lines (+0/-0)
2 files modified
lib/lp/app/javascript/confirmationoverlay/assets/skins/sam/confirmationoverlay-skin.css (+0/-0)
lib/lp/app/javascript/ordering/assets/skins/sam/ordering-skin.css (+0/-0)
Reviewer Review Type Date Requested Status
Kristian Glass (community) Approve
Colin Watson (community) Approve
Review via email: mp+385050@code.launchpad.net

Commit message

Be more consistent with skin layouts

Description of the change

Components can contain a -core.css and a -skin.css. Our build system expects both to exist, otherwise it won't compile the -core.css at all and the file will not be included in combo.css.

Pre-SASS all of the files were named explicitly, which is a bit strange for a skin/component system, so lets just make sure all the components are valid for the skin that we have ('sam').

Ensure that all the components have appropriate files, even if they are template (empty).

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve
Revision history for this message
Kristian Glass (doismellburning) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/app/javascript/confirmationoverlay/assets/skins/sam/confirmationoverlay-skin.css b/lib/lp/app/javascript/confirmationoverlay/assets/skins/sam/confirmationoverlay-skin.css
2new file mode 100644
3index 0000000..e69de29
4--- /dev/null
5+++ b/lib/lp/app/javascript/confirmationoverlay/assets/skins/sam/confirmationoverlay-skin.css
6diff --git a/lib/lp/app/javascript/ordering/assets/skins/sam/ordering-skin.css b/lib/lp/app/javascript/ordering/assets/skins/sam/ordering-skin.css
7new file mode 100644
8index 0000000..e69de29
9--- /dev/null
10+++ b/lib/lp/app/javascript/ordering/assets/skins/sam/ordering-skin.css
11diff --git a/lib/lp/app/javascript/ui/assets/skins/sam/banner.css b/lib/lp/app/javascript/ui/assets/skins/sam/banner-skin.css
12similarity index 100%
13rename from lib/lp/app/javascript/ui/assets/skins/sam/banner.css
14rename to lib/lp/app/javascript/ui/assets/skins/sam/banner-skin.css

Subscribers

People subscribed via source and target branches

to status/vote changes: