Repository: cordova-docs Updated Branches: refs/heads/master 69a068d19 -> fc483207b
Fixing some styling issues and simplifying content on Contribute page. Fixing CSS for contact page. Fixing Makefile for Unix. Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/fc483207 Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/fc483207 Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/fc483207 Branch: refs/heads/master Commit: fc483207bf214d5df70a450d8fe880e325ea6cff Parents: 69a068d Author: Dmitry Blotsky <dmitry.blot...@gmail.com> Authored: Fri Nov 20 18:30:57 2015 -0800 Committer: Dmitry Blotsky <dmitry.blot...@gmail.com> Committed: Tue Nov 24 22:13:33 2015 -0800 ---------------------------------------------------------------------- Makefile | 14 ++ www/_data/mailing-lists.yml | 8 +- www/contact/index.html | 83 ++++++------ www/contribute/index.html | 122 ++++++++--------- www/contribute/issues.md | 22 +++- www/static/css-src/_contact.scss | 78 +++++++---- www/static/css-src/_contribute.scss | 218 +++++++++++++++++-------------- www/static/css-src/main.scss | 4 - 8 files changed, 308 insertions(+), 241 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/fc483207/Makefile ---------------------------------------------------------------------- diff --git a/Makefile b/Makefile index d9ba501..d0d24a7 100644 --- a/Makefile +++ b/Makefile @@ -194,20 +194,34 @@ $(TOC_FILES): $(BIN_DIR)/toc.js Makefile $(MAIN_STYLE_FILE): $(SCSS_SRC) +# NODE: +# $(@D) means "directory part of target" $(CSS_DEST_DIR)/%.css: $(CSS_SRC_DIR)/%.less Makefile +ifdef WINDOWS -$(MKDIRP) $(subst /,\,$(@D)) +else + $(MKDIRP) $(@D) +endif echo ---> $@ echo --->> $@ $(LESSC) $< >> $@ $(CSS_DEST_DIR)/%.css: $(CSS_SRC_DIR)/%.scss Makefile +ifdef WINDOWS -$(MKDIRP) $(subst /,\,$(@D)) +else + $(MKDIRP) $(@D) +endif echo ---> $@ echo --->> $@ $(SASSC) $< >> $@ $(CSS_DEST_DIR)/%.css: $(CSS_SRC_DIR)/%.css Makefile +ifdef WINDOWS -$(MKDIRP) $(subst /,\,$(@D)) +else + $(MKDIRP) $(@D) +endif echo ---> $@ echo --->> $@ cat $< >> $@ http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/fc483207/www/_data/mailing-lists.yml ---------------------------------------------------------------------- diff --git a/www/_data/mailing-lists.yml b/www/_data/mailing-lists.yml index fd14ece..8f0a520 100644 --- a/www/_data/mailing-lists.yml +++ b/www/_data/mailing-lists.yml @@ -24,8 +24,8 @@ text: Dev Mailing List Archive href: http://callback.markmail.org/search/?q=#query:%20list%3Aorg.apache.incubator.callback-dev+page:1+state:facets description: > - Dev mailing list is a place for discussion about developing Apache Cordova. - <br/>If you are a Cordova user looking for help, use the cordova tag on <a href="http://stackoverflow.com/questions/tagged/cordova";>Stack Overflow</a>. + The Dev mailing list is a place for discussion about developing Apache Cordova. + <br/>If you are a Cordova user looking for help, use the <a href="http://stackoverflow.com/questions/tagged/cordova";>cordova tag on Stack Overflow</a>. - title: Commits Mailing List links: @@ -53,7 +53,7 @@ text: Commits Mailing List Archive href: http://callback.markmail.org/search/?q=#query:%20list%3Aorg.apache.incubator.callback-commits+page:1+state:facets description: > - Commits mailing list tracks commit logs for Apache Cordova repos. + The Commits mailing list tracks commit logs for Apache Cordova repos. - title: Issues Mailing List links: @@ -81,4 +81,4 @@ text: Issues Mailing List Archive href: http://apache.markmail.org/search/?q=#query:%20list%3Aorg.apache.cordova.issues%20order%3Adate-backward+page:1+state:facets description: > - Issues mailing list tracks comments and updates to <a href="http://issues.apache.org/jira/browse/CB";>Jira items</a> regarding Apache Cordova. + The Issues mailing list tracks comments and updates to <a href="http://issues.apache.org/jira/browse/CB";>Jira items</a> regarding Apache Cordova. http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/fc483207/www/contact/index.html ---------------------------------------------------------------------- diff --git a/www/contact/index.html b/www/contact/index.html index 6e75208..aff008c 100644 --- a/www/contact/index.html +++ b/www/contact/index.html @@ -3,53 +3,58 @@ layout: page title: Contact --- -<div class="row"> - <div class="col-sm-12"> - <h1>Mailing List</h1> +<div class="contact"> + <div class="row"> + <div class="col-sm-12"> + <h1>Mailing List</h1> + <p> + <em>NOTE: To subscribe to a mailing list, send a non-empty email to its subscription address from the email address that you wish to be subscribed.</em> + </p> + </div> </div> -</div> -<div class="row"> - <div class="col-sm-12"> - <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true"> - {% for category in site.data.mailing-lists %} - <div class="panel panel-default"> - <div class="panel-heading" role="tab" id="headingOne"> - <h4 class="panel-title"> - <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne"> - {{ category.title }} - </a> - </h4> - <p> - {{ category.description }} - </p> - </div> - <div id="collapseOne" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne"> - <div class="panel-body"> - <ul class="list mailing-list"> - {% for list in category.links %} - <li> - <div class="row"> - <div class="col-sm-5"> - <div class="list-label"> - {{ list.label }} + <div class="row"> + <div class="col-sm-12"> + <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true"> + {% for category in site.data.mailing-lists %} + <div class="panel panel-default"> + <div class="panel-heading" role="tab" id="headingOne"> + <h4 class="panel-title"> + <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne"> + {{ category.title }} + </a> + </h4> + <p> + {{ category.description }} + </p> + </div> + <div id="collapseOne" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne"> + <div class="panel-body"> + <ul class="list mailing-list"> + {% for list in category.links %} + <li> + <div class="row"> + <div class="col-sm-5"> + <div class="list-label"> + {{ list.label }} + </div> </div> - </div> - <div class="col-sm-7"> - <div class="email-link"> - <a href="{{ list.href }}">{{ list.text }}<span></span></a> - <div class="email_link_button"> - <a href="{{ list.href }}"><span class="glyphicon glyphicon-menu-right"></span></a> + <div class="col-sm-7"> + <div class="email-link"> + <a href="{{ list.href }}">{{ list.text }}<span></span></a> + <div class="email_link_button"> + <a href="{{ list.href }}"><span class="glyphicon glyphicon-menu-right"></span></a> + </div> </div> </div> </div> - </div> - </li> - {% endfor %} - </ul> + </li> + {% endfor %} + </ul> + </div> </div> </div> + {% endfor %} </div> - {% endfor %} </div> </div> </div> http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/fc483207/www/contribute/index.html ---------------------------------------------------------------------- diff --git a/www/contribute/index.html b/www/contribute/index.html index 331d5f4..02f31e1 100644 --- a/www/contribute/index.html +++ b/www/contribute/index.html @@ -7,75 +7,75 @@ title: Contribute <!-- <link rel="stylesheet" type="text/css" href="static/css/lib/bootstrap.css"/> --> <!-- Main jumbotron for a primary marketing message or call to action --> -<div class="container"> - <div class="row"> - <div class="col-sm-12 text-center"> - <h1>Want to Contribute?</h1> - <p>Contributors are needed to keep the project moving forward!</p> - </div> +<div class="row"> + <div class="col-sm-12 text-center"> + <h1>Want to Contribute?</h1> + <p>Contributors are needed to keep the project moving forward!</p> </div> - <div class="row"> - <div class="col-sm-7"> - <p>To share your contributions with the community, you can send a pull request on GitHub to the Apache git mirrors. You can also advocate for your changes directly on our <a href="{{ site.baseurl }}/contact">dev mailing list</a>.</p> - <h2>Get Started Now</h2> - <ul class="contribute-get-started-steps"> - <li>Join the <a href="{{ site.baseurl }}/contact">Mailing List</a></li> - <li>Sign the <a href="http://www.apache.org/licenses/#clas";>Individual Contributor License Agreement (ICLA)</a></li> - <li>Create an account in <a href="https://issues.apache.org/jira/secure/Dashboard.jspa";>Apache Jira</a></li> - <li>Bookmark the official URL for <a href="https://issues.apache.org/jira/browse/CB/?selectedTab=com.atlassian.jira.jira-projects-plugin:issues-panel";>Cordova Issues</a></li> - <li>Send a brief introduction of yourself to <a href="mailto:d...@cordova.apache.org";>d...@cordova.apache.org</a></li> - <li>Read the <a href="./contribute_guidelines.html">Contributor Guidelines</a></li> - </ul> - </div> - <div class="col-sm-5"> - <div class="well"> - <div class="input-group"> - <input id="jira-search-box" type="text" class="form-control" placeholder="Search current issue list..."> - <span class="input-group-btn"> - <button id="jira-search-button" class="btn btn-default" type="button"><span class="glyphicon glyphicon-search"></span></button> - </span> - </div> - <ul class="nav"> - <li><a href="https://issues.apache.org/jira/browse/CB/?selectedTab=com.atlassian.jira.jira-projects-plugin:issues-panel";><span class="glyphicon glyphicon-warning-sign"></span><i> </i>View All Issues</a></li> - <li><a href="./issues.html"><div class="report-bug-icon"></div><i> </i>Report a Bug</a></li> - <li><a href="https://people.apache.org/committer-index.html";><span class="glyphicon glyphicon-user"></span><i> </i>View Committers / Non-Committers</a></li> - </ul> +</div> +<div class="row"> + <div class="col-sm-7"> + <h2>What you can do</h2> + <ul class="contribute-get-started-steps"> + <li>File a <a href="./issues.html">bug or task</a></li> + <li>Read the <a href="./contribute_guidelines.html">Contributor Guidelines</a></li> + <li>Join the <a href="{{ site.baseurl }}/contact">Dev mailing list</a> and send a brief introduction of yourself to it</li> + <li>Join the discussion on <a href="http://slack.cordova.io/";>Slack</a></li> + <li>Sign the <a href="http://www.apache.org/licenses/#clas";>Individual Contributor License Agreement (ICLA)</a> and <a href="mailto:secret...@apache.org";>submit it</a></li> + </ul> + </div> + <div class="col-sm-5"> + <div class="well"> + <div class="input-group"> + <input id="jira-search-box" type="text" class="form-control" placeholder="Search current issue list..."> + <span class="input-group-btn"> + <button id="jira-search-button" class="btn btn-default" type="button"><span class="glyphicon glyphicon-search"></span></button> + </span> </div> + <ul class="nav issue-links"> + <li> + <span class="glyphicon glyphicon-warning-sign"></span><i> </i> + <a href="https://issues.apache.org/jira/browse/CB/?selectedTab=com.atlassian.jira.jira-projects-plugin:issues-panel";>View All Issues</a> + </li> + <li> + <span class="glyphicon glyphicon-user"></span><i> </i> + See all <a href="https://people.apache.org/committers-by-project.html#cordova";>Committers</a> / <a href="https://people.apache.org/committer-index.html#unlistedclas";>Contributors</a> + </li> + </ul> </div> </div> - <div class="row"> - {% for projectType in site.data.contribute-repo-links %} - {% assign firstProjectType = forloop.first %} - <div class="col-lg-4 col-md-6"> - <ul class="list platforms-list"> - <h2>{{ projectType.title }}</h2> - {% for project in projectType.projects %} +</div> +<div class="row"> + {% for projectType in site.data.contribute-repo-links %} + {% assign firstProjectType = forloop.first %} + <div class="col-lg-4 col-md-6"> + <ul class="list platforms-list"> + <h2>{{ projectType.title }}</h2> + {% for project in projectType.projects %} - {% if firstProjectType and forloop.first %} - {% assign itemClass = "first" %} - {% else %} - {% assign itemClass = "" %} - {% endif %} + {% if firstProjectType and forloop.first %} + {% assign itemClass = "first" %} + {% else %} + {% assign itemClass = "" %} + {% endif %} - <li class="{{ itemClass }}"> - <div class="row"> - <div class="col-xs-12 col-sm-8 project-label"> - {{ project.project }} + <li class="{{ itemClass }}"> + <div class="row"> + <div class="col-xs-12 col-sm-8 project-label"> + {{ project.project }} + </div> + <div class="col-xs-12 col-sm-4 project-links"> + <div class="link-box"> + <a class="link-github" target="_blank" href="{{ project.mirror }}"></a> </div> - <div class="col-xs-12 col-sm-4 project-links"> - <div class="link-box"> - <a class="link-github" target="_blank" href="{{ project.mirror }}"></a> - </div> - <div class="link-box"> - <a class="link-apache" target="_blank" href="{{ project.apache }}"></a> - </div> + <div class="link-box"> + <a class="link-apache" target="_blank" href="{{ project.apache }}"></a> </div> </div> - </li> - {% endfor %} - </ul> - </div> - {% endfor %} + </div> + </li> + {% endfor %} + </ul> </div> + {% endfor %} </div> -<!-- /container --> http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/fc483207/www/contribute/issues.md ---------------------------------------------------------------------- diff --git a/www/contribute/issues.md b/www/contribute/issues.md index 1ded514..25eb8ca 100644 --- a/www/contribute/issues.md +++ b/www/contribute/issues.md @@ -4,11 +4,13 @@ title: Apache Cordova Reporting Issues --- # Reporting Issues -Thank you for helping to improve Cordova! Issues for Apache Cordova are hosted at the Apache [JIRA](https://issues.apache.org/jira/browse/CB). A JIRA account is required before you can submit issues (you can [create one here](https://issues.apache.org/jira/secure/Signup!default.jspa)). Before submitting an issue, please take a moment to search JIRA to see if an issue already exists. If it does, please consider commenting or voting for the issue to help raise its visibility. + +Thank you for helping to improve Cordova! Issues for Apache Cordova are hosted at the Apache [JIRA](https://issues.apache.org/jira/browse/CB). A JIRA account is required before you can submit issues (you can easily [create one here](https://issues.apache.org/jira/secure/Signup!default.jspa)). Before submitting an issue, please take a moment to search JIRA to see if an issue already exists. If it does, please consider commenting or voting for the issue to help raise its visibility. ## Creating an issue in JIRA -Once you have created an account and logged in, click the blue "Create" button at the top of the [Cordova JIRA](https://issues.apache.org/jira/browse/CB) page to create an issue. In the dialog that appears, please fill out the following fields to the best of your ability. All fields besides those listed here can be left blank. + +Once you have created an account and logged in, click the blue "Create" button at the top of the [Cordova JIRA](https://issues.apache.org/jira/browse/CB) page to create an issue. In the dialog that appears, please fill out the following fields _to the best of your ability_. All fields besides those listed here can be left blank. Field | Description ----------------| ----- @@ -20,7 +22,7 @@ Affects Version | The version of the component that this issue pertains to Environment | Some extra context about the environment in which a bug was found (e.g. the version of Android you are running, your version of the Cordova CLI, your development platform, etc.) Description | A thorough description of the issue. For bugs, please provide code or steps for reproduction as well as any device logs or stack traces you might have. Labels | Please label your issue with the platforms it affects (e.g. ios, windows, android, etc.) and nothing else -Priority | The impact of the issue. See below +Priority | The impact of the issue (see below) ## Issue Priority @@ -31,3 +33,17 @@ We gauge issue priority on the following scale: * **Blocker:** Catastrophic bugs that prevent projects from building or cause basic projects to crash immediately. It is very unlikely that a bug is a Blocker If you aren't sure about the priority, leave the default (major) selected. Please be aware that as our contributors triage issues, they may change the priority based on our criteria. + +## Finding out versions + +You can quickly find out versions of platforms/plugins you're using by running: + + cordova platform ls + +or + + cordova plugin ls + +in your project respectively. You can find out the version of the Cordova CLI you're using by running: + + cordova --version http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/fc483207/www/static/css-src/_contact.scss ---------------------------------------------------------------------- diff --git a/www/static/css-src/_contact.scss b/www/static/css-src/_contact.scss index acc0340..fe4c22c 100644 --- a/www/static/css-src/_contact.scss +++ b/www/static/css-src/_contact.scss @@ -1,39 +1,59 @@ -.mailing-list { - li { - padding: 0px; +.contact { + .panel-title { + margin-bottom: 1em; } + .mailing-list { + li { + padding: 0px; + } - .email-link { - padding-top: 8px; - padding-bottom: 8px; - padding-left: 8px; - padding-right: 55px; + .email-link { + padding-top: 8px; + padding-bottom: 8px; + padding-left: 8px; + padding-right: 55px; - white-space:nowrap; + white-space:nowrap; - text-overflow:ellipsis; - overflow: hidden; - .email_link_button { - width: 100%; - max-width: 50px; - position:absolute; - top: 0; - right: 0; - margin-right: 15px; - display: inline-block; - background-color: $brand-primary; - vertical-align: middle; - text-align: center; - .glyphicon { - color: white; - font-size: 20px; - padding-top: 8px; - padding-bottom: 8px; + text-overflow:ellipsis; + overflow: hidden; + .email_link_button { + width: 100%; + max-width: 50px; + position:absolute; + top: 0; + right: 0; + margin-right: 15px; + display: inline-block; + background-color: $brand-primary; + vertical-align: middle; + text-align: center; + .glyphicon { + color: white; + font-size: 20px; + padding-top: 8px; + padding-bottom: 8px; + } } } + + .list-label { + padding: 8px; + } } - .list-label { - padding: 8px; + .list { + padding:0; + } + + .list li { + background:$gray-10; + position: relative; + list-style: none; + margin-bottom: 16px; + + white-space:nowrap; + text-overflow:ellipsis; + overflow: hidden; } } http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/fc483207/www/static/css-src/_contribute.scss ---------------------------------------------------------------------- diff --git a/www/static/css-src/_contribute.scss b/www/static/css-src/_contribute.scss index 1567094..f06d5bd 100644 --- a/www/static/css-src/_contribute.scss +++ b/www/static/css-src/_contribute.scss @@ -1,136 +1,152 @@ -.sprite_img { - position:relative; - left: 0px; - margin: 0; - padding: 0; - top:0; - width: 85px; - height: 85px; - background-repeat: no-repeat; - background-size: cover; -} - -.report-bug-icon { - @extend .sprite_img; - height:1em; - width:1em; - background-image: url("{{ site.baseurl }}/static/img/bug_icon.svg"); - background-size: 2em 1em; - display: inline-block; -} - -a:hover .report-bug-icon { - background-position: -1em 0; -} - -.list { - padding:0; -} - -.list li { - background:$gray-10; - position: relative; - list-style: none; - margin-bottom: 16px; - - white-space:nowrap; - text-overflow:ellipsis; - overflow: hidden; -} - -.platforms-list { - li { - a { - float: right; - -webkit-transition: background 0.25s linear; - -moz-transition: background 0.25s linear; - transition: background 0.25s linear; - width: 36px; - background: url("{{ site.baseurl }}/static/img/sprite.png") no-repeat; - background-position: 3px -127px; - background-color: #4cc2e4; - height: 36px; - } - - a.link-apache { - background-position: 2px -94px; - margin-right: 3px; - } +.contribute-help { + .sprite_img { + position:relative; + left: 0px; + margin: 0; + padding: 0; + top:0; + width: 85px; + height: 85px; + background-repeat: no-repeat; + background-size: cover; + } - a.link-github { - background-position: 3px -127px; - } + .report-bug-icon { + @extend .sprite_img; + height:1em; + width:1em; + background-image: url("{{ site.baseurl }}/static/img/bug_icon.svg"); + background-size: 2em 1em; + display: inline-block; + } - .project-label { - margin: 8px -8px 8px 8px; - } + a:hover .report-bug-icon { + background-position: -1em 0; } - @media (min-width: $screen-sm-min) { - li.first { - a.link-apache { - width: 115px; - } + .list { + padding:0; + } - a.link-github { - width: 90px; - } + .list li { + background:$gray-10; + position: relative; + list-style: none; + margin-bottom: 16px; - .project-label { - width: 35%; - } + white-space:nowrap; + text-overflow:ellipsis; + overflow: hidden; + } - .project-links { - width: 65%; + .well { + .issue-links { + li { + margin: 10px 0px; + a { + color: $brand-primary; + display: inline; + padding: 0px; + &:hover { + color: $brand-primary-darker; + text-decoration: underline; + } + } } } } - @media (max-width: $screen-xs-max) { + .platforms-list { li { a { - display: inline-block; - float: none; + float: right; + -webkit-transition: background 0.25s linear; + -moz-transition: background 0.25s linear; + transition: background 0.25s linear; + width: 36px; + background: url("{{ site.baseurl }}/static/img/sprite.png") no-repeat; + background-position: 3px -127px; + background-color: #4cc2e4; + height: 36px; } a.link-apache { background-position: 2px -94px; - width: 108px; margin-right: 3px; } a.link-github { background-position: 3px -127px; - width: 90px; } - .project-label{ - text-align: center; - padding: 12px; - margin: 0px; + .project-label { + margin: 8px -8px 8px 8px; + } + } + + @media (min-width: $screen-sm-min) { + li.first { + a.link-apache { + width: 115px; + } + + a.link-github { + width: 90px; + } + + .project-label { + width: 35%; + } + + .project-links { + width: 65%; + } } + } - .link-box { - width: 49.5%; - display: inline-block; - text-align: center; - background-color: $brand-primary; - padding-top: 4px; + @media (max-width: $screen-xs-max) { + li { + a { + display: inline-block; + float: none; + } + + a.link-apache { + background-position: 2px -94px; + width: 108px; + margin-right: 3px; + } + + a.link-github { + background-position: 3px -127px; + width: 90px; + } + + .project-label{ + text-align: center; + padding: 12px; + margin: 0px; + } + + .link-box { + width: 49.5%; + display: inline-block; + text-align: center; + background-color: $brand-primary; + padding-top: 4px; + } } } } -} -.contribute-get-started-steps { - padding-left: 17px; - counter-reset: contribute-steps-counter; - > li { - margin-bottom:.5em; + .contribute-get-started-steps { + padding-left: 17px; + counter-reset: contribute-steps-counter; + > li { + margin-bottom:.5em; + } } -} -// Issues and Contributing guides within contribute -.contribute-help { table { @extend .table; @extend .table-bordered; http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/fc483207/www/static/css-src/main.scss ---------------------------------------------------------------------- diff --git a/www/static/css-src/main.scss b/www/static/css-src/main.scss index ea2410e..7367a8a 100644 --- a/www/static/css-src/main.scss +++ b/www/static/css-src/main.scss @@ -115,10 +115,6 @@ h2 { padding: 1px 5px; } -.contribute-content { - padding-top: 15px; -} - .blue-divider { width:100%; height:4px; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
