Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

prototype
- Activity
- Members
- Labels
- Wiki
- Custom issue tracker
- Model registry

Snippets Groups Projects

d90bcb89

Commit d90bcb89 authored 11 years ago by John Ferris

Downloads
- Plain Diff

Merge branch revisions.

parents e3dfb73a 262bac98

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

css/screen.css 47 additions, 75 deletions

css/screen.css
css/wysiwyg.css 29 additions, 40 deletions

css/wysiwyg.css
sass/base/_elements.scss 3 additions, 11 deletions

sass/base/_elements.scss
sass/base/_normalize.scss 1 addition, 1 deletion

sass/base/_normalize.scss
sass/base/_vars.scss 10 additions, 10 deletions

sass/base/_vars.scss
sass/components/_image.scss 0 additions, 1 deletion

sass/components/_image.scss
sass/components/_nav.scss 14 additions, 18 deletions

sass/components/_nav.scss
sass/utilities/_nup.scss 0 additions, 1 deletion

sass/utilities/_nup.scss

with 104 additions and 157 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment