Skip to content
This repository has been archived by the owner on Aug 22, 2022. It is now read-only.

Apply SASS styles from agency #93

Merged
merged 1 commit into from
Jun 9, 2016
Merged

Apply SASS styles from agency #93

merged 1 commit into from
Jun 9, 2016

Conversation

omarkhan
Copy link
Contributor

@omarkhan omarkhan commented May 26, 2016

Testing

  1. make rundev
  2. Go to /registration/, check that everything works and looks right
  3. Try to log in, make sure everything works and looks right
  4. Go to the instance manager, make sure everything works and looks right

help_text=('The name of your institution, company or project.'
'\n\nExample: Hogwarts Online Learning'),
help_text=('The name of your institution, company or project.<br/>'
'Example: Hogwarts Online Learning'),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be possible to avoid using HTML in the help text?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@omarkhan omarkhan force-pushed the omar/sass branch 4 times, most recently from 6b21c6e to 1da90cc Compare June 3, 2016 16:42
@@ -49,20 +64,22 @@ app.controller('Registration', ['$scope', '$http', 'djangoForm', function($scope
return _.keys($scope.form).filter(key => !/^\$/.test(key));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@omarkhan The => function notation does not have very good browser support yet. It doesn't work with latest Safari on OS X, for example.

@mtyaka
Copy link
Member

mtyaka commented Jun 7, 2016

👍


# Variables ###################################################################

SVN = svn checkout
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't svn export be the more appropriate command here? (I only vaguely remember svn commands, and I always got them wrong, so don't give too much on what I'm saying.)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@smarnach Yeah, svn export would be better, but I think it only allows you to export the full repository (top-level folder) while here we want to only dowload the stylesheets subfolder.

Copy link
Contributor

@smarnach smarnach Jun 7, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mtyaka I just ran

svn export https://github.com/at-import/breakpoint/tags/v2.7.0/stylesheets

on my machine, and it worked fine. (If I remember correctly, there wasn't even a distinction in svn between a full repository and its subdirectories. Each subdirectory is a full repository in its own right.)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@smarnach Hmm, you're right it works for me, too. I think there was some problem with export though. I'll let @omarkhan answer :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the tip @smarnach. I have never used subversion before, I didn't know about svn export. I have updated the Makefile to use svn export --force (without --force it refuses to download into the current directory)

@omarkhan
Copy link
Contributor Author

omarkhan commented Jun 7, 2016

Rebased, I will merge when the build is green.

@omarkhan omarkhan merged commit 9b699c9 into master Jun 9, 2016
@omarkhan omarkhan deleted the omar/sass branch June 9, 2016 03:09
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants