Merge lp:~developer-ubuntu-com-dev/developer-ubuntu-com/generic-steps-style into lp:developer-ubuntu-com

Proposed by David Planella
Status: Merged
Merged at revision: 141
Proposed branch: lp:~developer-ubuntu-com-dev/developer-ubuntu-com/generic-steps-style
Merge into: lp:developer-ubuntu-com
Diff against target: 21 lines (+7/-0) (has conflicts)
1 file modified
developer_portal/static/developer_portal/css/devportal.css (+7/-0)
Text conflict in developer_portal/static/developer_portal/css/devportal.css
To merge this branch: bzr merge lp:~developer-ubuntu-com-dev/developer-ubuntu-com/generic-steps-style
Reviewer Review Type Date Requested Status
Michael Hall Pending
Review via email: mp+270173@code.launchpad.net

This proposal supersedes a proposal from 2015-03-16.

Description of the change

I wanted to add a 3-step guide to install the SDK, similar to the one on:

http://www.ubuntu.com/cloud/bootstack

While the step classes are available in the CSS from the Ubuntu web guidelines, the length of the vertical line connecting the steps is specific to that particular page and its layout.

I'm proposing removing the line for the steps, so that we can use the steps classes generically without having to specify a hardcoded length.

To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote : Posted in a previous version of this proposal

Should be fine, not sure where we still use this though

review: Approve
Revision history for this message
David Callé (davidc3) wrote : Posted in a previous version of this proposal

Conflict

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'developer_portal/static/developer_portal/css/devportal.css'
2--- developer_portal/static/developer_portal/css/devportal.css 2015-03-03 23:33:10 +0000
3+++ developer_portal/static/developer_portal/css/devportal.css 2015-09-04 13:27:37 +0000
4@@ -207,6 +207,7 @@
5 font-weight: 300;
6 padding: 0.695652em 0.869565em;
7 }
8+<<<<<<< TREE
9
10
11 /* Used in Webapp-generator */
12@@ -245,3 +246,9 @@
13 background: none repeat scroll 0% 0% #DD4814;
14 color: #FFF;
15 }
16+=======
17+
18+.row-step.step-one .step::after {
19+ content: none;
20+}
21+>>>>>>> MERGE-SOURCE

Subscribers

People subscribed via source and target branches