Commit graph

538 commits

Author SHA1 Message Date
Kyle Drake
138725d00b fix acceptance tests 2014-04-17 20:24:32 -07:00
Kyle Drake
66e6a3d38c fixes for erb templates 2014-04-17 20:21:02 -07:00
Kyle Drake
04ec621dfe double equals for layout 2014-04-17 19:06:20 -07:00
Victoria Wang
873c2c6467 Merge branch 'v2' of github.com:neocities/neocities into v2 2014-04-17 14:29:21 -07:00
Victoria Wang
e1bf1baca8 Commented out things related to folders, which will not be ready yet. Added an overlaying link box for the filename link that I covered up with the translucent dark overlays. 2014-04-17 14:29:09 -07:00
Kyle Drake
2b004fca1a fix merge 2014-04-17 14:16:40 -07:00
Kyle Drake
a96f16fded work on converting slim to erb 2014-04-17 14:12:12 -07:00
Victoria Wang
7b6f796ecb CSS for files in file listing, with edit/delete overlay. 2014-04-16 22:27:23 -07:00
Victoria Wang
7d1e9d5b4f compressed CSS changes 2014-04-16 18:32:27 -07:00
Victoria Wang
bce6da0b75 Changed app.rb to reference erb instead of slim for the dashboard 2014-04-16 18:32:09 -07:00
Victoria Wang
a3b7e33af1 Changes to dashboard incl some initial styling/cleaning up of the file listing 2014-04-16 18:31:34 -07:00
Victoria Wang
b0432b3f5f Merge branch 'v2' of github.com:neocities/neocities into v2 2014-04-16 17:52:56 -07:00
Victoria Wang
57e2a10625 Edits to header css (some related to new dashboard changes) 2014-04-16 17:52:26 -07:00
Victoria Wang
203ad0d2d1 dashboard.erb and related images 2014-04-16 17:50:51 -07:00
Victoria Wang
f9f90b6f6d CSS and adjusted layout.erb for new dashboard design (non-dashboard pages need to be fixed) 2014-04-16 17:50:01 -07:00
Victoria Wang
1124ab6c87 Added Sass to Gemfile 2014-04-16 17:47:40 -07:00
Kyle Drake
cff94803a9 add social schema, associations 2014-04-16 15:16:36 -07:00
Kyle Drake
c0b362ea43 mockup routes 2014-04-15 16:49:14 -07:00
Kyle Drake
6ecf5539b5 check for empty username 2014-04-15 16:43:13 -07:00
Kyle Drake
c9a2638acf fix contrib copy 2014-04-14 10:09:36 -07:00
Kyle Drake
f03163e70e fix contrib copy 2014-04-14 10:08:52 -07:00
Kyle Drake
e799e72c15 contrib info 2014-04-14 10:08:32 -07:00
Kyle Drake
d30ecb5e1d use a single footer 2014-04-14 10:04:30 -07:00
Kyle Drake
5d931efd7f fix create page template 2014-04-14 08:46:56 -07:00
Kyle Drake
978219d0e0 http -> https 2014-04-13 21:09:12 -07:00
Kyle Drake
ade9bedc33 https for screenshots 2014-04-13 21:03:37 -07:00
Kyle Drake
21fe0d524b Merge branch 'master' of github.com:neocities/neocities 2014-04-13 21:03:25 -07:00
Kyle Drake
80da2513cb remove old browse template 2014-04-13 21:02:56 -07:00
Scott O'Hara
f9d09284d6 CSS update for small screens
fixes a padding-left issue where the file list was bumping up against the left edge of the browser window on small screen sizes.

Also swapped out style="float: right" for the class "float-Right" on the right column menu icons.
2014-04-13 20:47:50 -04:00
Scott O'Hara
212f1e5479 typo. more white space.
typo on abut.erb

more whitespace conversion. (sublime just does it automatically)
2014-04-13 20:38:54 -04:00
Scott O'Hara
b1de628450 new framework link, remove some useless code, whitespace killer
Add new CSS framework to the tutorials page

Remove some unused code from the neocities index file and default template index file

Killed lots of white space in the files i touched...
2014-04-13 20:38:54 -04:00
Kyle Drake
c9332ad648 enable JS for screenshots 2014-04-13 11:10:26 -07:00
Kyle Drake
a1a7b9be30 add sidekiq admin 2014-04-13 01:11:39 -07:00
Kyle Drake
5e89ec8048 float to right on controls for files 2014-04-12 23:42:18 -07:00
Kyle Drake
2efd219d9a cleaner looking file display on dashboard 2014-04-12 23:39:35 -07:00
Kyle Drake
a2b867d628 update open source reference 2014-04-12 14:52:57 -07:00
Kyle Drake
f3e2ae0c63 update readme 2014-04-12 14:43:45 -07:00
Kyle Drake
c5eb247391 ignores and pre-added folders for travis 2014-04-12 14:15:16 -07:00
Kyle Drake
67fba91421 remove domain, sites and sites_test from master gitignore 2014-04-12 14:14:19 -07:00
Kyle Drake
d6f567e765 try to get travis build working 2014-04-12 14:02:12 -07:00
Kyle Drake
d83cef0e09 library list, require_login for custom_domain 2014-04-12 13:47:50 -07:00
Kyle Drake
48ec974195 update API with better examples, complete node.js versions 2014-04-12 02:41:47 -07:00
Kyle Drake
b4e3f9a643 error status codes, pretty output 2014-04-11 16:30:11 -07:00
Kyle Drake
2ec6043af8 error status codes, pretty output 2014-04-11 16:28:06 -07:00
Kyle Drake
edf5949747 update example 2014-04-11 15:55:57 -07:00
Kyle Drake
d8da8de5b3
api/info 2014-04-11 15:51:09 -07:00
Kyle Drake
7cd7973144 /api/delete 2014-04-11 14:17:27 -07:00
Kyle Drake
2c2ef2d015 /api/delete 2014-04-11 14:07:56 -07:00
Kyle Drake
ee4874bb82 lil' fixes, and reference to neocities-node 2014-04-11 13:22:00 -07:00
Kyle Drake
d8010d22e8 correct location of cat img 2014-04-10 22:37:13 -07:00