Commit Graph

125 Commits

Author SHA1 Message Date
Andreas Stephanides
8ece6d4d1c header farbe 2013-11-04 18:45:30 +01:00
Andreas Stephanides
00d6fe0e21 small design changes 2013-11-01 23:09:48 +01:00
Thomas Blazek
0fe92a4b48 css contentbox 2013-10-02 10:03:28 +02:00
Thomas Blazek
81fdda6248 Global Stylesheet contentbox 2013-10-01 12:33:25 +02:00
Andreas Stephanides
1f3be74256 Merge branch 'master' of github.com:fetsite/fetsite 2013-09-26 10:29:18 +02:00
Andreas Stephanides
1daf392997 font fix 2013-09-26 10:30:56 +02:00
Andreas Stephanides
202910e185 max-width 2013-09-26 10:28:47 +02:00
Andreas Stephanides
cf9e3b59a4 Font 2013-09-26 10:20:59 +02:00
Andreas Stephanides
7b3ade7747 Farbanpassungen & Linkbox 2013-09-26 10:10:46 +02:00
22a9a20ac9 linkbox 2013-09-26 09:22:06 +02:00
Andreas Stephanides
1951549486 studium frame 2013-09-11 20:07:33 +02:00
Andreas Stephanides
f067d5564f neuigkeitem block shadow 2013-09-10 22:14:17 +02:00
Andreas Stephanides
19140f4c2f stacked container no padding 2013-09-10 21:40:41 +02:00
Andreas Stephanides
5f2aa37c7c fetprofile list 2013-09-10 17:47:25 +02:00
Andreas Stephanides
2cff08fd6c Merge branch 'master' of https://github.com/HausdorffHimself/fetsite 2013-09-10 11:27:30 +02:00
Andreas Stephanides
7057d4d573 fet logo 2013-09-10 11:01:02 +02:00
HausdorffHimself
0e12cec427 CHANGE: New visualisation of Gallery 2013-09-10 01:55:47 +02:00
Andreas Stephanides
a60bdf5149 design und struktur (container - unnötige entfernt) 2013-09-07 12:37:16 +02:00
Andreas Stephanides
1c44ddc2ba Merge branch 'master' of https://github.com/HausdorffHimself/fetsite 2013-09-06 18:26:58 +02:00
HausdorffHimself
de48cccdbc CHANGE: Mouseover für Themengruppe 2013-09-06 18:26:33 +02:00
Andreas Stephanides
bb4b24d9cb styling zeugs 2013-09-06 18:04:57 +02:00
Andreas Stephanides
12f426235f design-tests1 2013-09-06 00:33:12 +02:00
Thomas Blazek
918a3c9360 Merge branch 'master' of github.com:fetsite/fetsite
Conflicts:
	app/views/galleries/index.html.erb
2013-08-27 21:27:05 +02:00
Andreas Stephanides
a38eec97a5 links überarbeitet 2013-08-27 20:44:03 +02:00
Thomas Blazek
8dd2252954 design 2013-08-27 19:39:00 +02:00
HausdorffHimself
58a5802dac Merge branch 'master' of https://github.com/fetsite/fetsite 2013-08-27 18:37:09 +02:00
HausdorffHimself
338f3a0a06 CHANGE: Attachment-Einbindung in TinyMCE mit Thumbnails und eigenem Partial-View 2013-08-27 18:35:50 +02:00
HausdorffHimself
b42e490f7f FIX: downcase in JS 2013-08-27 18:34:02 +02:00
Thomas Blazek
ac254ffbc2 Show CSS verändert 2013-08-27 08:42:12 +02:00
Thomas Blazek
5b316f8780 css fuer gallery viewer 2013-08-27 00:32:53 +02:00
Thomas Blazek
93667d4cea Beispiel überarbeitungen 2013-08-25 15:16:19 +02:00
HausdorffHimself
b92cbfab8a CHANGE: Attachment in TinyMCE: Default ist Link 2013-08-24 17:16:55 +02:00
HausdorffHimself
94614b1d5b ADD: Dateieinbindung in TinyMCE für Attachments 2013-08-24 04:07:33 +02:00
Thomas Blazek
a2f3608d8f Jquery-upload 2013-08-22 00:08:06 +02:00
Thomas Blazek
c2647a1d08 broken gallery 2013-08-21 18:27:47 +02:00
Thomas Blazek
18dfe60309 Designänderungen 2013-08-19 23:38:34 +02:00
HausdorffHimself
e7a7be8333 CHANGE: keine borders für Themen 2013-08-19 18:51:23 +02:00
Thomas Blazek
1db27955de Merge branch 'master' of https://github.com/andreassteph/fetsite
Conflicts:
	config/routes.rb
2013-08-19 15:47:12 +02:00
Thomas Blazek
f58c359d36 Introducing Lecturers 2013-08-19 15:43:54 +02:00
Thomas Blazek
52f7e0b9ba designänderung 2013-08-19 15:43:30 +02:00
Andreas Stephanides
4c48a4b769 fetzneditions 2013-08-19 15:42:08 +02:00
Andreas Stephanides
34b602e126 a lot of new models ...
Fotogallary, gremien, fetprofil,
2013-08-19 15:39:56 +02:00
Thomas Blazek
28d5f8b96a semester tweaks 2013-08-19 09:11:45 +02:00
Thomas Blazek
ecb0275c44 nav divider css eingebaut 2013-08-14 22:37:53 +02:00
HausdorffHimself
c7d63c4c19 Merge branch 'master' of https://github.com/fetsite/fetsite
Conflicts:
	app/views/layouts/menu.html.erb
	config/routes.rb
2013-08-13 19:05:26 +02:00
HausdorffHimself
c73984e81d ADD: JavaScript zur Angleichung der Höhe innerhalb einer "row-fluid" 2013-08-13 18:34:05 +02:00
HausdorffHimself
e055b60a53 ADD: Informationsseite:
Models für Themengruppen/Themen/FAQs/Attachments
Views für Themengruppen/Themen
2013-08-13 18:31:22 +02:00
HausdorffHimself
a2b35d3d60 ADD: jquery-ui 2013-08-13 18:29:06 +02:00
Thomas Blazek
989f0c2c54 Responsive Menubar springt direkt auf 100% Kopfzeile um
Kann einfach rückgängig gemacht werden, indem in bootstrap-
responsive.scss die earlymax-classe bearbeitet/gelöscht wird.
2013-08-13 00:07:29 +02:00
Thomas Blazek
96753c3fef Merge branch 'master' of https://github.com/andreassteph/fetsite into calendar
Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/lvas/show.html.erb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
	db/schema.rb
2013-08-12 13:44:47 +02:00