From 098a5dda4872354589fbc3b607600d847c166668 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Fri, 17 May 2013 16:41:21 -0400 Subject: [PATCH 1/4] studio - reverts google web font import method back to original @font-face syntax since Sass doesn't like google's original method when processing --- cms/static/sass/assets/_fonts.scss | 49 +++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/cms/static/sass/assets/_fonts.scss b/cms/static/sass/assets/_fonts.scss index 0798d3bb31..0e05f044fc 100644 --- a/cms/static/sass/assets/_fonts.scss +++ b/cms/static/sass/assets/_fonts.scss @@ -1,8 +1,49 @@ // studio - assets - fonts +// NOTE: Sass currently can't process the standard Google Web Font import method, so a @font-face with src declaration of the .woff file that the Google @import method uses is needed :/ // ==================== -// import from google fonts - Open Sans -@import url(http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,700,300); +// Open Sans - http://www.google.com/fonts/specimen/Open+Sans +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: local('Open Sans Bold'), local('OpenSans-Bold'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/k3k702ZOKiLJc3WVjuplzKRDOzjiPcYnFooOUGCOsRk.woff) format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 300; + src: local('Open Sans Light'), local('OpenSans-Light'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/DXI1ORHCpsQm3Vp6mXoaTaRDOzjiPcYnFooOUGCOsRk.woff) format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 700; + src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxhbnBKKEOwRKgsHDreGcocg.woff) format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 300; + src: local('Open Sans Light Italic'), local('OpenSansLight-Italic'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxvR_54zmj3SbGZQh3vCOwvY.woff) format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 400; + src: local('Open Sans Italic'), local('OpenSans-Italic'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/xjAJXh38I15wypJXxuGMBrrIa-7acMAeDBVuclsi6Gc.woff) format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans'), local('OpenSans'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3bO3LdcAZYWl9Si6vvxL-qU.woff) format('woff'); +} -// import from google fonts - Bree -@import url(http://fonts.googleapis.com/css?family=Bree+Serif); +// Bree Serif - http://www.google.com/fonts/specimen/Bree+Serif +@font-face { + font-family: 'Bree Serif'; + font-style: normal; + font-weight: 400; + src: local('Bree Serif'), local('BreeSerif'), url(http://themes.googleusercontent.com/static/fonts/breeserif/v2/LQ7WLTaITDg4OSRuOZCps73hpw3pgy2gAi-Ip7WPMi0.woff) format('woff'); +} From bf8df497281f7954d4c7b7132a14f732ea3f8738 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Fri, 17 May 2013 15:34:14 -0400 Subject: [PATCH 2/4] studio - revising line height between course nav titles and prefixes --- cms/static/sass/elements/_header.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cms/static/sass/elements/_header.scss b/cms/static/sass/elements/_header.scss index 50167ff042..8c7d59038e 100644 --- a/cms/static/sass/elements/_header.scss +++ b/cms/static/sass/elements/_header.scss @@ -139,8 +139,8 @@ // specific elements - course nav .nav-course { width: 290px; + @extend .t-copy-sub1; margin-top: -($baseline/4); - @include font-size(14); > ol > .nav-item { vertical-align: bottom; @@ -158,8 +158,8 @@ color: $gray-d3; .label-prefix { - display: block; @include font-size(11); + display: block; font-weight: 400; } } From a54ecb98c62795ffa8c39f48cd079d63057a8860 Mon Sep 17 00:00:00 2001 From: e0d Date: Mon, 20 May 2013 11:59:56 -0400 Subject: [PATCH 3/4] resizing uri column --- lms/djangoapps/notes/migrations/0001_initial.py | 4 ++-- lms/djangoapps/notes/models.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lms/djangoapps/notes/migrations/0001_initial.py b/lms/djangoapps/notes/migrations/0001_initial.py index 738d121e79..0372a889df 100644 --- a/lms/djangoapps/notes/migrations/0001_initial.py +++ b/lms/djangoapps/notes/migrations/0001_initial.py @@ -13,7 +13,7 @@ class Migration(SchemaMigration): ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])), ('course_id', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)), - ('uri', self.gf('django.db.models.fields.CharField')(max_length=1024, db_index=True)), + ('uri', self.gf('django.db.models.fields.CharField')(max_length=512, db_index=True)), ('text', self.gf('django.db.models.fields.TextField')(default='')), ('quote', self.gf('django.db.models.fields.TextField')(default='')), ('range_start', self.gf('django.db.models.fields.CharField')(max_length=2048)), @@ -82,7 +82,7 @@ class Migration(SchemaMigration): 'tags': ('django.db.models.fields.TextField', [], {'default': "''"}), 'text': ('django.db.models.fields.TextField', [], {'default': "''"}), 'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}), - 'uri': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), + 'uri': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}), 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) } } diff --git a/lms/djangoapps/notes/models.py b/lms/djangoapps/notes/models.py index 7c9db7dc28..ec9e916dbc 100644 --- a/lms/djangoapps/notes/models.py +++ b/lms/djangoapps/notes/models.py @@ -9,7 +9,7 @@ import json class Note(models.Model): user = models.ForeignKey(User, db_index=True) course_id = models.CharField(max_length=255, db_index=True) - uri = models.CharField(max_length=1024, db_index=True) + uri = models.CharField(max_length=512, db_index=True) text = models.TextField(default="") quote = models.TextField(default="") range_start = models.CharField(max_length=2048) # xpath string @@ -54,7 +54,7 @@ class Note(models.Model): def get_absolute_url(self): ''' - Returns the aboslute url for the note object. + Returns the absolute url for the note object. ''' kwargs = {'course_id': self.course_id, 'note_id': str(self.pk)} return reverse('notes_api_note', kwargs=kwargs) From 0e3756449046f18081de3b7b967d5b9642917de4 Mon Sep 17 00:00:00 2001 From: e0d Date: Mon, 20 May 2013 12:01:25 -0400 Subject: [PATCH 4/4] pep8 fixes --- lms/djangoapps/notes/models.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lms/djangoapps/notes/models.py b/lms/djangoapps/notes/models.py index ec9e916dbc..4050516f13 100644 --- a/lms/djangoapps/notes/models.py +++ b/lms/djangoapps/notes/models.py @@ -21,9 +21,9 @@ class Note(models.Model): updated = models.DateTimeField(auto_now=True, db_index=True) def clean(self, json_body): - ''' + """ Cleans the note object or raises a ValidationError. - ''' + """ if json_body is None: raise ValidationError('Note must have a body.') @@ -53,16 +53,16 @@ class Note(models.Model): self.tags = ",".join(tags) def get_absolute_url(self): - ''' + """ Returns the absolute url for the note object. - ''' + """ kwargs = {'course_id': self.course_id, 'note_id': str(self.pk)} return reverse('notes_api_note', kwargs=kwargs) def as_dict(self): - ''' + """ Returns the note object as a dictionary. - ''' + """ return { 'id': self.pk, 'user_id': self.user.pk,