Commit Graph
2137 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets dffa2fa9e9 Use sass variabled for backgroung and border colors 2015-03-13 23:40:46 -07:00
Dmitriy Zaporozhets 2da2720584 Improve css for file actions 2015-03-13 19:20:25 -07:00
Dmitriy Zaporozhets 80b2f3fb86 Implement merge requests search
It is same search like we have at issues page. It allows to quickly
filter merge requests based on title or desription. I copy-pasted some
js code from Issues.js. In future search (filtering) logic should be
refactoed into one class for merge requests and issues
2015-03-12 16:20:58 -07:00
Dmitriy Zaporozhets 12ba855ffd Merge branch 'improve-import-page' into 'master'
Style improvements to import page

See merge request !1685
2015-03-12 18:18:05 +00:00
Dmitriy Zaporozhets 59621e9034 Merge branch 'blue-theme' into 'master'
Add blue theme to GitLab

See merge request !1682
2015-03-12 17:09:55 +00:00
Dmitriy Zaporozhets dd78cd1ce4 Style improvements to import page 2015-03-12 10:04:09 -07:00
Marin Jankovski ec1c30ceec Merge branch 'hover_toggle_sidebar'
Conflicts:
	app/assets/stylesheets/generic/nav_sidebar.scss
2015-03-12 09:32:52 -07:00
Dmitriy Zaporozhets 158507d942 Add blue theme to GitLab 2015-03-11 21:29:11 -07:00
Marin Jankovski 1647994ada Merge branch 'fix-code-preview' into 'master'
Fix code preview theme setting for comments, issues, merge requests, and snippets

User color scheme was not being used: default white color scheme was always chosen. Also, default background for code in notes was always overriding the user color scheme.

Closes #1139

See merge request !357
2015-03-11 18:41:36 +00:00
Dmitriy Zaporozhets 04c674e679 Cleanup after removing group tab from dashboard aside 2015-03-10 13:27:58 -07:00
Dmitriy Zaporozhets 1178dacdb6 Fix line highlight being hidden by header 2015-03-10 10:50:53 -07:00
Dmitriy Zaporozhets cadf76562a Fix highlight of selected lines 2015-03-10 10:30:07 -07:00
Stan Hu 4218a2bfcf Fix code preview theme setting for comments, issues, merge requests, and snippets.
Also preserve code preview color scheme in events dashboard.

Assign default colors to all code blocks shown as <pre class="code highlight [color_scheme]">

Closes #1139
2015-03-10 08:11:20 -07:00
Dmitriy Zaporozhets e0caed91e2 Improve tree view UI 2015-03-10 00:51:16 -07:00
Dmitriy Zaporozhets 21c99e6a77 Fix font size for collapse button 2015-03-09 19:21:42 -07:00
Dmitriy Zaporozhets f6113c2818 Merge branch 'font-size-14' into 'master'
Font size 14px

Increase base font size from 13 to 14px. We already have it in most of ui elements so no need to duplicate `font-size: 14px` everywhere - just change base variable

See merge request !1663
2015-03-10 01:46:21 +00:00
Dmitriy Zaporozhets 3bce263a3d Reduce base vertical padding 2015-03-09 18:45:36 -07:00
Dmitriy Zaporozhets fcaf0a89e8 Fix heading small color to darker one 2015-03-09 18:28:30 -07:00
Dmitriy Zaporozhets 9720240be2 Increate default font-size from 13 to 14px 2015-03-09 18:25:32 -07:00
Dmitriy Zaporozhets 86a17390dd Make broadcast message look like a warning by default 2015-03-09 18:09:23 -07:00
Dmitriy Zaporozhets 90f5dacc4b Fix wrong body padding and pre color 2015-03-09 17:59:32 -07:00
Dmitriy Zaporozhets b70b1055b1 Merge branch 'more-flat-ui' into 'master'
Apply more styles from Flatly theme

Also add bottom margin for footer links on login page

See merge request !1661
2015-03-10 00:41:01 +00:00
Dmitriy Zaporozhets 2a76c7fd8a Merge branch 'improve-milestones-ui' into 'master'
Improve milestones ui

* change progress bar colors
* make milestone title bold

See merge request !1660
2015-03-10 00:13:28 +00:00
Dmitriy Zaporozhets 6b76ffc222 Apply more styles from Flatly theme
Also add bottom margin for footer links on login page
2015-03-09 17:06:08 -07:00
Dmitriy Zaporozhets 3e6147ada4 Make milestone titles in list to be bold 2015-03-09 16:24:45 -07:00
Dmitriy Zaporozhets d36ee3190a Add starred projects page to dashboard 2015-03-09 14:12:03 -07:00
Dmitriy Zaporozhets c025c0d589 Merge branch 'webstorage-exception' into 'master'
Properly handle autosave local storage exceptions.

Addresses https://gitlab.com/gitlab-org/gitlab-ce/issues/1182.

See merge request !1643
2015-03-08 23:43:40 +00:00
Dmitriy Zaporozhets cec2be2d76 Merge branch 'fix-milestone-list-width' into 'master'
Fix width of text in milestone lists and add assignee icon to merge requests.

Before:

![Screen_Shot_2015-03-06_at_13.48.00](https://dev.gitlab.org/gitlab/gitlabhq/uploads/5754638a3ebb79dee1f6c07a6e268035/Screen_Shot_2015-03-06_at_13.48.00.png)

After:

![Screen_Shot_2015-03-06_at_13.48.14](https://dev.gitlab.org/gitlab/gitlabhq/uploads/fe92adf387964efb3d460dfc61ced3b8/Screen_Shot_2015-03-06_at_13.48.14.png)

I've checked with other screen widths as well, and it looks good all the time.

See merge request !1645
2015-03-08 23:41:26 +00:00
Dmitriy Zaporozhets f930cf8461 Merge branch 'dev-ui' into 'master'
GitLab UI development kit and UI guide help section

Page with UI elements get generated from current css so you can immediately check how your css changes affects common ui elements. Because it requires GitLab runnning I cannot put it to documentation so I just put link to localhost from development section

cc @developers @sabba @sytse

See merge request !1653
2015-03-08 23:18:32 +00:00
Dmitriy Zaporozhets 1b5ca280d8 Merge two css files with same name 2015-03-08 15:21:28 -07:00
Dmitriy Zaporozhets b5c3e1a431 Add GitLab UI development kit 2015-03-08 14:46:22 -07:00
Dmitriy Zaporozhets 2e99d7c915 Prevent date overflow on issue page on mobile devices 2015-03-08 12:15:09 -07:00
Dmitriy Zaporozhets 1475cb9aaa Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-07 11:24:21 -08:00
Dmitriy Zaporozhets be3edeb6a1 Small UI improvements after css refactoring 2015-03-07 10:35:17 -08:00
Douwe Maan bf02072a86 Properly handle autosave local storage exceptions. 2015-03-07 11:27:39 +01:00
Dmitriy Zaporozhets e2b8025abe Increase input padding and fit issue form in laptop screen 2015-03-07 01:06:16 -08:00
Dmitriy Zaporozhets 4f3d704845 Move mixins and bootstrap css to base directory 2015-03-07 00:29:25 -08:00
Dmitriy Zaporozhets 433b4c76fc Apply some styles from flatly theme 2015-03-07 00:28:53 -08:00
Robert Schilling 0f66b32965 Merge branch 'master' into 'master'
Fix editor in IE producing errors #1096

IE seems to handle form submission oddly. It gets fired twice - once from javascript and once from the form click, producing 2 identical requests and causing #1096.

Similar issues: http://stackoverflow.com/questions/14373800

Returning false from the click event seems to fix it and shouldn't cause any side-effects.

See merge request !366
2015-03-07 08:00:57 +00:00
Dmitriy Zaporozhets 887cf5c710 Better name for pages css dir 2015-03-06 21:40:23 -08:00
Dmitriy Zaporozhets ceb8f9dfeb Remove custom css for panels and navs 2015-03-06 21:15:15 -08:00
Dmitriy Zaporozhets 3cbc0b1c6d Cleanup css variables 2015-03-06 20:02:34 -08:00
Dmitriy Zaporozhets cd73b26e07 Refactor gitlab css state colors 2015-03-06 19:02:12 -08:00
Dmitriy Zaporozhets 3bfd53149c Replace bs-callout with alert 2015-03-06 18:36:22 -08:00
Douwe Maan be94e13552 Add assignee icon to milestone merge requests. 2015-03-06 14:08:40 +01:00
Douwe Maan dc558eb24e Fix width of text in milestone lists. 2015-03-06 13:49:27 +01:00
Dmitriy Zaporozhets b14d21e174 Use bootstrap buttons with custom colors instead of own css 2015-03-06 02:18:53 -08:00
Dmitriy Zaporozhets 8b53d9efe6 Fix bug with active tab remembering (saving cookie with different path) 2015-03-06 01:41:47 -08:00
Dmitriy Zaporozhets 65105ff3bb Improve projects list
* Add search filtering for group projects
* Show all user projects on dashboard
* Refactor projects list into one view
* Hide big list of projects with 'Show all' button
2015-03-04 17:22:55 -08:00
unknown 6fd0600685 Bugfix #1096 2015-03-04 22:05:15 +02:00